readded support for Envjs(location), Envjs(location, policy), Envjs(p…

…olicy). The firt two are deprecated but will be supported for the forseeable future
thatcher · Feb 5, 2010 · 569158c · 569158c
1 parent 43f9217
commit 569158c
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 46 deletions.
diff --git a/dist/env.js b/dist/env.js
@@ -7,18 +7,29 @@
 
 var Envjs = function(){
     var i,
-        name;
-    for(i=0;i<arguments.length;i++){
-        for ( name in arguments[i] ) {
-            var g = arguments[i].__lookupGetter__(name), 
-                s = arguments[i].__lookupSetter__(name);
-            if ( g || s ) {
-                if ( g ) Envjs.__defineGetter__(name, g);
-                if ( s ) Envjs.__defineSetter__(name, s);
-            } else
-                Envjs[name] = arguments[i][name];
-        }
-    }
+        name
+        override = function(){
+            for(i=0;i<arguments.length;i++){
+                for ( name in arguments[i] ) {
+                    var g = arguments[i].__lookupGetter__(name), 
+                        s = arguments[i].__lookupSetter__(name);
+                    if ( g || s ) {
+                        if ( g ) Envjs.__defineGetter__(name, g);
+                        if ( s ) Envjs.__defineSetter__(name, s);
+                    } else
+                        Envjs[name] = arguments[i][name];
+                }
+            }
+        };
+    if(arguments.length === 1 && typeof(arguments[0]) == 'string'){
+        window.location = arguments[0];
+    }else if (arguments.length === 1 && typeof(arguments[0]) == "object"){
+        override(arguments[0])
+    }else if(arguments.length === 2){
+        override(arguments[1]);
+        window.location = arguments[0];
+    }
+    return;
 };
 
 //eg "Mozilla"

diff --git a/dist/env.rhino.js b/dist/env.rhino.js
@@ -7,18 +7,29 @@
 
 var Envjs = function(){
     var i,
-        name;
-    for(i=0;i<arguments.length;i++){
-        for ( name in arguments[i] ) {
-            var g = arguments[i].__lookupGetter__(name), 
-                s = arguments[i].__lookupSetter__(name);
-            if ( g || s ) {
-                if ( g ) Envjs.__defineGetter__(name, g);
-                if ( s ) Envjs.__defineSetter__(name, s);
-            } else
-                Envjs[name] = arguments[i][name];
-        }
-    }
+        name
+        override = function(){
+            for(i=0;i<arguments.length;i++){
+                for ( name in arguments[i] ) {
+                    var g = arguments[i].__lookupGetter__(name), 
+                        s = arguments[i].__lookupSetter__(name);
+                    if ( g || s ) {
+                        if ( g ) Envjs.__defineGetter__(name, g);
+                        if ( s ) Envjs.__defineSetter__(name, s);
+                    } else
+                        Envjs[name] = arguments[i][name];
+                }
+            }
+        };
+    if(arguments.length === 1 && typeof(arguments[0]) == 'string'){
+        window.location = arguments[0];
+    }else if (arguments.length === 1 && typeof(arguments[0]) == "object"){
+        override(arguments[0])
+    }else if(arguments.length === 2){
+        override(arguments[1]);
+        window.location = arguments[0];
+    }
+    return;
 };
 
 //eg "Mozilla"

diff --git a/dist/platform/core.js b/dist/platform/core.js
@@ -7,18 +7,29 @@
 
 var Envjs = function(){
     var i,
-        name;
-    for(i=0;i<arguments.length;i++){
-        for ( name in arguments[i] ) {
-            var g = arguments[i].__lookupGetter__(name), 
-                s = arguments[i].__lookupSetter__(name);
-            if ( g || s ) {
-                if ( g ) Envjs.__defineGetter__(name, g);
-                if ( s ) Envjs.__defineSetter__(name, s);
-            } else
-                Envjs[name] = arguments[i][name];
-        }
+        name
+        override = function(){
+            for(i=0;i<arguments.length;i++){
+                for ( name in arguments[i] ) {
+                    var g = arguments[i].__lookupGetter__(name), 
+                        s = arguments[i].__lookupSetter__(name);
+                    if ( g || s ) {
+                        if ( g ) Envjs.__defineGetter__(name, g);
+                        if ( s ) Envjs.__defineSetter__(name, s);
+                    } else
+                        Envjs[name] = arguments[i][name];
+                }
+            }
+        };
+    if(arguments.length === 1 && typeof(arguments[0]) == 'string'){
+        window.location = arguments[0];
+    }else if (arguments.length === 1 && typeof(arguments[0]) == "object"){
+        override(arguments[0])
+    }else if(arguments.length === 2){
+        override(arguments[1]);
+        window.location = arguments[0];
     }
+    return;
 };
 
 //eg "Mozilla"

diff --git a/src/env/core/__global__.js b/src/env/core/__global__.js
@@ -7,18 +7,29 @@
 
 var Envjs = function(){
     var i,
-        name;
-    for(i=0;i<arguments.length;i++){
-        for ( name in arguments[i] ) {
-            var g = arguments[i].__lookupGetter__(name), 
-                s = arguments[i].__lookupSetter__(name);
-            if ( g || s ) {
-                if ( g ) Envjs.__defineGetter__(name, g);
-                if ( s ) Envjs.__defineSetter__(name, s);
-            } else
-                Envjs[name] = arguments[i][name];
-        }
+        name
+        override = function(){
+            for(i=0;i<arguments.length;i++){
+                for ( name in arguments[i] ) {
+                    var g = arguments[i].__lookupGetter__(name), 
+                        s = arguments[i].__lookupSetter__(name);
+                    if ( g || s ) {
+                        if ( g ) Envjs.__defineGetter__(name, g);
+                        if ( s ) Envjs.__defineSetter__(name, s);
+                    } else
+                        Envjs[name] = arguments[i][name];
+                }
+            }
+        };
+    if(arguments.length === 1 && typeof(arguments[0]) == 'string'){
+        window.location = arguments[0];
+    }else if (arguments.length === 1 && typeof(arguments[0]) == "object"){
+        override(arguments[0])
+    }else if(arguments.length === 2){
+        override(arguments[1]);
+        window.location = arguments[0];
     }
+    return;
 };
 
 //eg "Mozilla"