added __initStandardObjects__ to internal window to protect prototype…

…s across windows
thatcher · Feb 6, 2010 · a531039 · a531039
1 parent ee8ffd9
commit a531039
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 23 deletions.
diff --git a/dist/env.rhino.js b/dist/env.rhino.js
@@ -9135,6 +9135,7 @@ Envjs.platform       = "Rhino ";//how do we get the version
  */
 Envjs.proxy = function(scope, parent){
 
+
     var _scope = scope;
         _parent = parent||null,
         _this = this,
@@ -9210,7 +9211,7 @@ Envjs.proxy = function(scope, parent){
                 return (value === _scope || value === this );
             }
         });
-
+        
     return _proxy;
 };
 

diff --git a/dist/platform/rhino.js b/dist/platform/rhino.js
@@ -339,6 +339,7 @@ Envjs.platform       = "Rhino ";//how do we get the version
  */
 Envjs.proxy = function(scope, parent){
 
+
     var _scope = scope;
         _parent = parent||null,
         _this = this,
@@ -414,7 +415,7 @@ Envjs.proxy = function(scope, parent){
                 return (value === _scope || value === this );
             }
         });
-
+        
     return _proxy;
 };
 

diff --git a/dist/window.js b/dist/window.js
@@ -282,16 +282,7 @@ Window = function(scope, parent, opener){
     });
 
 
-    var __Array__;
-    if(!scope.Array){
-        __Array__ = function(){
-            return new parent.top.Array();
-        };
-        __extend__(__Array__.prototype, parent.top.Array.prototype);
-        scope.__defineGetter__('Array', function(){
-            return  __Array__;
-        });
-    }
+    __initStandardObjects__(scope, parent);
 
 
     var $uuid = new Date().getTime()+'-'+Math.floor(Math.random()*1000000000000000); 
@@ -565,6 +556,55 @@ var __top__ = function(_scope){
 
 var __windows__ = {};
 
+var __initStandardObjects__ = function(scope, parent){
+
+    var __Array__;
+    if(!scope.Array){
+        __Array__ = function(){
+            return new parent.top.Array();
+        };
+        __extend__(__Array__.prototype, parent.top.Array.prototype);
+        scope.__defineGetter__('Array', function(){
+            return  __Array__;
+        });
+    }
+
+    var __Object__;
+    if(!scope.Object){
+        __Object__ = function(){
+            return new parent.top.Object();
+        };
+        __extend__(__Object__.prototype, parent.top.Object.prototype);
+        scope.__defineGetter__('Object', function(){
+            return  __Object__;
+        });
+    }
+
+
+    var __Date__;
+    if(!scope.Date){
+        __Date__ = function(){
+            return new parent.top.Date();
+        };
+        __extend__(__Date__.prototype, parent.top.Date.prototype);
+        scope.__defineGetter__('Date', function(){
+            return  __Date__;
+        });
+    }
+
+    var __Number__;
+    if(!scope.Number){
+        __Number__ = function(){
+            return new parent.top.Number();
+        };
+        __extend__(__Number__.prototype, parent.top.Number.prototype);
+        scope.__defineGetter__('Number', function(){
+            return  __Number__;
+        });
+    }
+
+};
+
 //finally pre-supply the window with the window-like environment
 new Window(__this__, __this__);
 

diff --git a/src/env/rhino/window.js b/src/env/rhino/window.js
@@ -18,6 +18,7 @@ Envjs.platform       = "Rhino ";//how do we get the version
  */
 Envjs.proxy = function(scope, parent){
 
+
     var _scope = scope;
         _parent = parent||null,
         _this = this,
@@ -93,6 +94,6 @@ Envjs.proxy = function(scope, parent){
                 return (value === _scope || value === this );
             }
         });
-
+        
     return _proxy;
 };
diff --git a/src/window/window.js b/src/window/window.js
@@ -18,16 +18,7 @@ Window = function(scope, parent, opener){
     });
 
 
-    var __Array__;
-    if(!scope.Array){
-        __Array__ = function(){
-            return new parent.top.Array();
-        };
-        __extend__(__Array__.prototype, parent.top.Array.prototype);
-        scope.__defineGetter__('Array', function(){
-            return  __Array__;
-        });
-    }
+    __initStandardObjects__(scope, parent);
 
 
     var $uuid = new Date().getTime()+'-'+Math.floor(Math.random()*1000000000000000); 
@@ -301,6 +292,55 @@ var __top__ = function(_scope){
 
 var __windows__ = {};
 
+var __initStandardObjects__ = function(scope, parent){
+
+    var __Array__;
+    if(!scope.Array){
+        __Array__ = function(){
+            return new parent.top.Array();
+        };
+        __extend__(__Array__.prototype, parent.top.Array.prototype);
+        scope.__defineGetter__('Array', function(){
+            return  __Array__;
+        });
+    }
+
+    var __Object__;
+    if(!scope.Object){
+        __Object__ = function(){
+            return new parent.top.Object();
+        };
+        __extend__(__Object__.prototype, parent.top.Object.prototype);
+        scope.__defineGetter__('Object', function(){
+            return  __Object__;
+        });
+    }
+
+
+    var __Date__;
+    if(!scope.Date){
+        __Date__ = function(){
+            return new parent.top.Date();
+        };
+        __extend__(__Date__.prototype, parent.top.Date.prototype);
+        scope.__defineGetter__('Date', function(){
+            return  __Date__;
+        });
+    }
+
+    var __Number__;
+    if(!scope.Number){
+        __Number__ = function(){
+            return new parent.top.Number();
+        };
+        __extend__(__Number__.prototype, parent.top.Number.prototype);
+        scope.__defineGetter__('Number', function(){
+            return  __Number__;
+        });
+    }
+
+};
+
 //finally pre-supply the window with the window-like environment
 new Window(__this__, __this__);