You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2009/07/24 07:42:42 UTC
svn commit: r797330 - in
/incubator/shindig/trunk/features/src/main/javascript/features/rpc:
ifpc.transport.js rmr.transport.js rpc.js wpm.transport.js
Author: johnh
Date: Fri Jul 24 05:42:42 2009
New Revision: 797330
URL: http://svn.apache.org/viewvc?rev=797330&view=rev
Log:
Cleanups.
Explicitly referencing parent, frames, and setTimeout through the window object.
Resolves SHINDIG-1127.
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js
incubator/shindig/trunk/features/src/main/javascript/features/rpc/rmr.transport.js
incubator/shindig/trunk/features/src/main/javascript/features/rpc/rpc.js
incubator/shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js
Modified: incubator/shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js?rev=797330&r1=797329&r2=797330&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js Fri Jul 24 05:42:42 2009
@@ -95,7 +95,7 @@
iframePool.push(iframe);
}
iframe.src = src;
- setTimeout(function() { document.body.appendChild(iframe); }, 0);
+ window.setTimeout(function() { document.body.appendChild(iframe); }, 0);
}
return {
Modified: incubator/shindig/trunk/features/src/main/javascript/features/rpc/rmr.transport.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/rpc/rmr.transport.js?rev=797330&r1=797329&r2=797330&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/rpc/rmr.transport.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/rpc/rmr.transport.js Fri Jul 24 05:42:42 2009
@@ -204,7 +204,7 @@
return;
}
- setTimeout(function() {
+ window.setTimeout(function() {
conductRmrSearch(frameId);
}, RMR_SEARCH_TIMEOUT);
}
Modified: incubator/shindig/trunk/features/src/main/javascript/features/rpc/rpc.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/rpc/rpc.js?rev=797330&r1=797329&r2=797330&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/rpc/rpc.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/rpc/rpc.js Fri Jul 24 05:42:42 2009
@@ -371,9 +371,9 @@
var targetEl = null;
if (target === '..') {
- targetEl = parent;
+ targetEl = window.parent;
} else {
- targetEl = frames[target];
+ targetEl = window.frames[target];
}
try {
// If this succeeds, then same-domain policy applied
Modified: incubator/shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js?rev=797330&r1=797329&r2=797330&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js Fri Jul 24 05:42:42 2009
@@ -81,7 +81,7 @@
},
call: function(targetId, from, rpc) {
- var targetWin = targetId === '..' ? parent : window.frames[targetId];
+ var targetWin = targetId === '..' ? window.parent : window.frames[targetId];
var relay = gadgets.rpc.getRelayUrl(targetId);
if (relay) {
targetWin.postMessage(gadgets.json.stringify(rpc), relay);