svn commit: r1125110 - in /shindig/trunk/features/src/main/javascript/features: core.config.base/configcontainer.js core.config.base/configgadget.js core.config.base/feature.xml osapi/gadgetsrpctransport.js

[johnh]

Author: johnh
Date: Thu May 19 21:15:38 2011
New Revision: 1125110

URL: http://svn.apache.org/viewvc?rev=1125110&view=rev
Log:
Remove gadgets.config.[isGadget,isContainer] fields.


Removed:
    
shindig/trunk/features/src/main/javascript/features/core.config.base/configcontainer.js
    
shindig/trunk/features/src/main/javascript/features/core.config.base/configgadget.js
Modified:
    
shindig/trunk/features/src/main/javascript/features/core.config.base/feature.xml
    
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js

Modified: 
shindig/trunk/features/src/main/javascript/features/core.config.base/feature.xml
URL: 
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.config.base/feature.xml?rev=1125110&r1=1125109&r2=1125110&view=diff
==============================================================================
--- 
shindig/trunk/features/src/main/javascript/features/core.config.base/feature.xml
 (original)
+++ 
shindig/trunk/features/src/main/javascript/features/core.config.base/feature.xml
 Thu May 19 21:15:38 2011
@@ -19,26 +19,13 @@
 <feature>
   <name>core.config.base</name>
   <dependency>globals</dependency>
-  <gadget>
+  <all>
     <script src="config.js"/>
-    <script src="configgadget.js"/>
     <api>
       <exports type="js">gadgets.config.register</exports>
       <exports type="js">gadgets.config.get</exports>
       <exports type="js">gadgets.config.init</exports>
       <exports type="js">gadgets.config.update</exports>      
-      <exports type="js">gadgets.config.isGadget</exports>
     </api>
-  </gadget>
-  <container>
-    <script src="config.js"/>
-    <script src="configcontainer.js"/>
-    <api>
-      <exports type="js">gadgets.config.register</exports>
-      <exports type="js">gadgets.config.get</exports>
-      <exports type="js">gadgets.config.init</exports>
-      <exports type="js">gadgets.config.update</exports>
-      <exports type="js">gadgets.config.isContainer</exports>
-    </api>
-  </container>
+  </all>
 </feature>

Modified: 
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
URL: 
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js?rev=1125110&r1=1125109&r2=1125110&view=diff
==============================================================================
--- 
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
 (original)
+++ 
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
 Thu May 19 21:15:38 2011
@@ -115,7 +115,7 @@ if (gadgets && gadgets.rpc) { //Dont bin
     }
 
     // Do not run this in container mode.
-    if (gadgets.config && gadgets.config.isGadget) {
+    if (gadgets.config && window !== window.top) {
       gadgets.config.register('osapi.services', null, init);
     }
   })();