[Emulator Bridge] Only cache the device window and route onmessage to it

zhizhangchen · Apr 16, 2013 · a1cf471 · a1cf471
1 parent 86276ae
commit a1cf471
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/lib/ripple/emulatorBridge.js b/lib/ripple/emulatorBridge.js
@@ -69,9 +69,19 @@ function _marshalScreen(win) {
 
 module.exports = {
     link: function  (win, doc) {
-        _win = win;
-        _doc = doc;
-        _xhr = win.XMLHttpRequest;
+        // Only cache the device window and route onmessage to it
+        if (win.parent.parent === win.parent &&
+                win.frameElement.getAttribute('id') === 'document') {
+            _win = win;
+            _doc = doc;
+            _xhr = win.XMLHttpRequest;
+
+            window.onmessage = function (e) {
+                if (typeof win.onmessage === 'function') {
+                    win.onmessage(e);
+                }
+            };
+        }
 
         require('ripple/widgetConfig').initialize();
 
@@ -83,11 +93,6 @@ module.exports = {
 
         marshal(window.tinyHippos, "tinyHippos");
         marshal(window.XMLHttpRequest, "XMLHttpRequest");
-        window.onmessage = function (e) {
-            if (typeof win.onmessage === 'function') {
-                win.onmessage(e);
-            }
-        };
 
         if (currentPlatform.initialize) {
             currentPlatform.initialize(win);