svn commit: r1127730 - /shindig/trunk/features/src/main/javascript/features/rpc/rpc.js

[mh...@apache.org]

Author: mhermanto
Date: Wed May 25 23:37:59 2011
New Revision: 1127730

URL: http://svn.apache.org/viewvc?rev=1127730&view=rev
Log:
gadgets.rpc transport IFPC is now also set in container mode.
http://codereview.appspot.com/4530072/

Modified:
    shindig/trunk/features/src/main/javascript/features/rpc/rpc.js

Modified: shindig/trunk/features/src/main/javascript/features/rpc/rpc.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/rpc/rpc.js?rev=1127730&r1=1127729&r2=1127730&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/rpc/rpc.js (original)
+++ shindig/trunk/features/src/main/javascript/features/rpc/rpc.js Wed May 25 23:37:59 2011
@@ -651,21 +651,29 @@ if (!window['gadgets']['rpc']) { // make
       passReferrerContents = prParts[1] || "origin";
     }
 
+
+    function setLegacyProtocolConfig(cfg) {
+      if (isLegacyProtocolConfig(cfg)) {
+        transport = gadgets.rpctx.ifpc;
+        transport.init(process, transportReady);
+      }
+    }
+    
+    function isLegacyProtocolConfig(cfg) {
+      return String(cfg['useLegacyProtocol']) === 'true';
+    }
+
     function setupContainedContext(rpctoken, opt_parent) {
       function init(config) {
         var cfg = config ? config['rpc'] : {};
-        var useLegacy = String(cfg['useLegacyProtocol']) === 'true';
         setReferrerConfig(cfg);
 
         // Parent-relative only.
         var parentRelayUrl = cfg['parentRelayUrl'] || '';
         parentRelayUrl = getOrigin(params['parent'] || opt_parent) + parentRelayUrl;
-        setRelayUrl('..', parentRelayUrl, useLegacy);
+        setRelayUrl('..', parentRelayUrl, isLegacyProtocolConfig(cfg));
 
-        if (useLegacy) {
-          transport = gadgets.rpctx.ifpc;
-          transport.init(process, transportReady);
-        }
+        setLegacyProtocolConfig(cfg);
 
         setAuthToken('..', rpctoken);
       }
@@ -1029,7 +1037,11 @@ if (!window['gadgets']['rpc']) { // make
         if (isChild) {
           setupReceiver('..');
         } else {
-          gadgets.config.register('rpc', null, function(config) { setReferrerConfig(config['rpc'] || {}); });
+          gadgets.config.register('rpc', null, function(config) {
+            var cfg = config['rpc'] || {};
+            setReferrerConfig(cfg);
+            setLegacyProtocolConfig(cfg);
+          });
         }
       },