worker api closure fixes + additional testing

2 files changed, 11 insertions, 11 deletions

diff --git a/src/library_browser.js b/src/library_browser.js
index 7e2866b8..b671e6f9 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -580,11 +580,11 @@ mergeInto(LibraryManager.library, {
     info.worker.onmessage = function(msg) {
       var info = Browser.workers[id];
       if (!info) return; // worker was destroyed meanwhile
-      var callbackId = msg.data.callbackId;
+      var callbackId = msg.data['callbackId'];
       var callbackInfo = info.callbacks[callbackId];
       if (!callbackInfo) return; // no callback or callback removed meanwhile
       info.callbacks[callbackId] = null; // TODO: reuse callbackIds, compress this
-      var data = msg.data.data;
+      var data = msg.data['data'];
       if (!data.byteLength) data = new Uint8Array(data);
       if (!info.buffer || info.bufferSize < data.length) {
         if (info.buffer) _free(info.buffer);
@@ -617,9 +617,9 @@ mergeInto(LibraryManager.library, {
       });
     }
     info.worker.postMessage({
-      funcName: funcName,
-      callbackId: callbackId,
-      data: {{{ makeHEAPView('U8', 'data', 'data + size') }}}
+      'funcName': funcName,
+      'callbackId': callbackId,
+      'data': {{{ makeHEAPView('U8', 'data', 'data + size') }}}
     });
   },
 
@@ -628,8 +628,8 @@ mergeInto(LibraryManager.library, {
     if (workerResponded) throw 'already responded!';
     workerResponded = true;
     postMessage({
-      callbackId: workerCallbackId,
-      data: {{{ makeHEAPView('U8', 'data', 'data + size') }}}
+      'callbackId': workerCallbackId,
+      'data': {{{ makeHEAPView('U8', 'data', 'data + size') }}}
     });
   }
 });
diff --git a/src/postamble.js b/src/postamble.js
index 86c990e8..365f77d0 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -119,9 +119,9 @@ var buffer = 0, bufferSize = 0;
 var inWorkerCall = false, workerResponded = false, workerCallbackId = -1;
 
 onmessage = function(msg) {
-  var func = Module['_' + msg.data.funcName];
-  if (!func) throw 'invalid worker function to call: ' + msg.data.funcName;
-  var data = msg.data.data;
+  var func = Module['_' + msg.data['funcName']];
+  if (!func) throw 'invalid worker function to call: ' + msg.data['funcName'];
+  var data = msg.data['data'];
   if (!data.byteLength) data = new Uint8Array(data);
   if (!buffer || bufferSize < data.length) {
     if (buffer) _free(buffer);
@@ -132,7 +132,7 @@ onmessage = function(msg) {
 
   inWorkerCall = true;
   workerResponded = false;
-  workerCallbackId = msg.data.callbackId;
+  workerCallbackId = msg.data['callbackId'];
   func(buffer, data.length);
   inWorkerCall = false;
 }