fixed the window.id issue in the embed code as well (and made a note …

…about it with the original patch)
manoelneto · Nov 10, 2011 · d37af8f · d37af8f
1 parent d8aa96a
commit d37af8f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/lightningjs-bootstrap.js b/lightningjs-bootstrap.js
@@ -46,11 +46,13 @@ window.lightningjs || (function(window, parentLightningjs){
             parentLoadPendingIdLookup = {},
             parentLoaded = false;
 
+        // this is a workaround for potential issue when window.id was set
+        // in older versions of the embed code
         if(deferredApiCalls && deferredApiCalls[0]) {
             var promiseFunctionId = deferredApiCalls[0][1];
             responses[promiseFunctionId] = api;
         }
-        
+
         // NOTE: root.lv contains the embed version
         api._load = function() {
             // this method gets called whenever the parent.window.onload event fires

diff --git a/lightningjs-bootstrap.min.js b/lightningjs-bootstrap.min.js
diff --git a/lightningjs-embed.js b/lightningjs-embed.js
@@ -24,7 +24,7 @@ window.lightningjs || (function(modules){
                     // (used to deserialize the callstack with proper dependency
                     // ordering later on)
                     promiseResponseId = ++responseCounter,
-                    promiseFunctionId = context ? (context.id || 0) : 0;
+                    promiseFunctionId = (context && context != theWindow) ? (context.id || 0) : 0;
 
                     // push this call onto the callstack
                     (internalModule.s = internalModule.s || []).push([promiseResponseId, promiseFunctionId, theArguments]);

diff --git a/lightningjs-embed.min.js b/lightningjs-embed.min.js