svn commit: r1001019 - /shindig/trunk/features/src/main/javascript/features/container/init.js

[mh...@apache.org]

Author: mhermanto
Date: Fri Sep 24 18:38:34 2010
New Revision: 1001019

URL: http://svn.apache.org/viewvc?rev=1001019&view=rev
Log:
Fix initialization code to resolve API_URI against container.
http://codereview.appspot.com/2263042/

Modified:
    shindig/trunk/features/src/main/javascript/features/container/init.js

Modified: shindig/trunk/features/src/main/javascript/features/container/init.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/init.js?rev=1001019&r1=1001018&r2=1001019&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/init.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container/init.js Fri Sep 24 18:38:34 2010
@@ -40,22 +40,19 @@
   }
 
   function initializeGlobalVars() {
-    window.__API_URI = getLastScriptUri();
-    window.__CONTAINER = window.__API_URI
-        ? window.__API_URI.getQP('container')
-        : 'default';
-    window.__CONTAINER_URI = shindig.uri(document.location.href);
-  }
+    window.__CONTAINER_URI = shindig.uri(window.location.href);
 
-  function getLastScriptUri() {
+    window.__API_URI = null;
     var scriptEls = document.getElementsByTagName('script');
-    var uri = null;
     if (scriptEls.length > 0) {
-      uri = shindig.uri(scriptEls[scriptEls.length - 1].src);
-      // In case script URI is relative, resolve it against window.location
-      uri.resolve(shindig.uri(window.location));
+      window.__API_URI = shindig.uri(scriptEls[scriptEls.length - 1].src);
+      // In case script URI is relative, resolve (make absolute) with container.
+      window.__API_URI.resolve(window.__CONTAINER_URI);
     }
-    return uri;
+    
+    window.__CONTAINER = window.__API_URI
+        ? window.__API_URI.getQP('container')
+        : 'default';
   }
 
   initializeConfig();