svn commit: r983127 - in /shindig/trunk/features/src/main/javascript/features/container: feature.xml init.js

[johnh]

Author: johnh
Date: Fri Aug  6 20:35:41 2010
New Revision: 983127

URL: http://svn.apache.org/viewvc?rev=983127&view=rev
Log:
Improved container initialization: resolve lastScriptUrl in the case of default 
auto-initialization.


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

Modified: 
shindig/trunk/features/src/main/javascript/features/container/feature.xml
URL: 
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/feature.xml?rev=983127&r1=983126&r2=983127&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/feature.xml 
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/feature.xml 
Fri Aug  6 20:35:41 2010
@@ -22,7 +22,7 @@ under the License.
   <dependency>globals</dependency>
   <dependency>core.log</dependency>
   <dependency>shindig.auth</dependency>
-  <dependency>shindig.uri</dependency>
+  <dependency>shindig.uri.ext</dependency>
   <dependency>core.util</dependency>
   <dependency>osapi</dependency>
   <dependency>rpc</dependency>

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=983127&r1=983126&r2=983127&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/init.js 
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/init.js Fri 
Aug  6 20:35:41 2010
@@ -50,9 +50,13 @@
 
   function getLastScriptUri() {
     var scriptEls = document.getElementsByTagName('script');
-    return (scriptEls.length > 0)
-        ? shindig.uri(scriptEls[scriptEls.length - 1].src)
-        : null;
+    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));
+    }
+    return uri;
   }
 
   initializeConfig();