svn commit: r1101237 - in /shindig/trunk/features/src: main/javascript/features/core.config.base/config.js test/javascript/features/mocks/env.js

[mh...@apache.org]

Author: mhermanto
Date: Mon May  9 21:49:29 2011
New Revision: 1101237

URL: http://svn.apache.org/viewvc?rev=1101237&view=rev
Log:
Check global namespace for presence of config, to avoid double-inclusion (like gadgets.rpc).

Modified:
    shindig/trunk/features/src/main/javascript/features/core.config.base/config.js
    shindig/trunk/features/src/test/javascript/features/mocks/env.js

Modified: shindig/trunk/features/src/main/javascript/features/core.config.base/config.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.config.base/config.js?rev=1101237&r1=1101236&r2=1101237&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/core.config.base/config.js (original)
+++ shindig/trunk/features/src/main/javascript/features/core.config.base/config.js Mon May  9 21:49:29 2011
@@ -55,7 +55,7 @@
  * configuration.
  */
 
-if (!gadgets.config) {
+if (!window['gadgets']['config']) {
 gadgets.config = function() {
   var ___jsl;
   var components = {};

Modified: shindig/trunk/features/src/test/javascript/features/mocks/env.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/mocks/env.js?rev=1101237&r1=1101236&r2=1101237&view=diff
==============================================================================
--- shindig/trunk/features/src/test/javascript/features/mocks/env.js (original)
+++ shindig/trunk/features/src/test/javascript/features/mocks/env.js Mon May  9 21:49:29 2011
@@ -32,5 +32,6 @@ var document = {
 
 // See mocks.FakeWindow if you need something more full featured.
 var window = {};
+window['gadgets'] = {};
 
 var alert = function() {};