Merge branch 'staging' into soon

3 years ago · 0a92c968d7
parent 0a499d2fcf 84844097dd
commit 0a92c968d7
2 changed files with 2 additions and 2 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@ -2547,7 +2547,7 @@ define([
                    // Use the async store in the main thread if workers are not available
                    require(['/common/outer/noworker.js'], waitFor2(function (NoWorker) {
                        NoWorker.onMessage(function (data) {
-                            msgEv.fire({data: data});
+                            msgEv.fire({data: data, origin: ''});
                        });
                        postMsg = function (d) { setTimeout(function () { NoWorker.query(d); }); };
                        NoWorker.create();
--- a/www/common/outer/noworker.js
+++ b/www/common/outer/noworker.js
@ -86,7 +86,7 @@ define([

    return {
        query: function (data) {
-            msgEv.fire({data: data});
+            msgEv.fire({data: data, origin: ''});
        },
        onMessage: function (cb) {
            sendMsg.reg(function (data) {