Merge branch 'master' into frame-scope

thatcher · Apr 17, 2010 · c9823c3 · c9823c3
2 parents fa042d5 + a4edebf
commit c9823c3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 24 deletions.
diff --git a/specs/env.qunit.js b/specs/env.qunit.js
@@ -30,6 +30,8 @@ QUnit.done = function( fail, pass){
         console.log('\t\tFAILED: ' +fail);
         console.log('\tCompleted in '+(_endtime-_starttime)+' milliseconds.\n');
     }
+    if (fail > 0)
+        quit(42);
 };
 QUnit.start = function(){
     _start();

diff --git a/specs/parser/spec.js b/specs/parser/spec.js
@@ -233,7 +233,7 @@ test('HTMLParser.parseDocument / malformed content', function(){
  */
 test('Image Loading', function(){
     var node;
-    if (!Envjs) {
+    if ((typeof Envjs == 'undefined') || !Envjs) {
         Envjs = {};
     }
 
@@ -297,7 +297,7 @@ test('Image Loading', function(){
  */
 test('Link Loading', function(){
     var node;
-    if (!Envjs) {
+    if ((typeof Envjs == 'undefined') || !Envjs) {
         Envjs = {};
     }
 

diff --git a/src/common/urlparse.js b/src/common/urlparse.js
@@ -149,7 +149,7 @@ urlparse.urlnormalize = function(url)
         // remove default port
         if ((parts.scheme === 'http' && parts.port == 80) ||
             (parts.scheme === 'https' && parts.port == 443)) {
-            delete parts.port;
+            parts.port = null;
             // hostname is already lower case
             parts.netloc = parts.hostname;
         }

diff --git a/src/event/eventtarget.js b/src/event/eventtarget.js
@@ -61,7 +61,6 @@ function __removeEventListener__(target, type, fn, phase){
         //used to clean all event listeners for a given node
         //console.log('cleaning all event listeners for node %s %s',target, target.uuid);
         delete $events[target.uuid];
-        $events[target.uuid] = null;
         return;
     }else if ( !$events[target.uuid][type] ){
         return;

diff --git a/src/parser/domparser.js b/src/parser/domparser.js
@@ -39,17 +39,13 @@ XMLParser.parseDocument = function(xmlstring, xmldoc, mimetype){
     }
 
     while(xmldoc.firstChild != null){
-        tmpNode = xmldoc.removeChild( xmldoc.firstChild );
-        delete tmpNode;
+        xmldoc.removeChild( xmldoc.firstChild );
     }
     while(parent.firstChild != null){
         tmpNode  = parent.removeChild( parent.firstChild );
         importedNode = xmldoc.importNode( tmpNode, true);
         xmldoc.appendChild( importedNode );
-        delete tmpNode;
     }
-    delete tmpdoc,
-           xmlstring;
     return xmldoc;
 };
 
@@ -111,8 +107,7 @@ HTMLParser.parseFragment = function(htmlstring, element){
     parent = tmpdoc.body.childNodes[0];
     while(element.firstChild != null){
         //zap the elements children so we can import
-        tmpNode = element.removeChild( element.firstChild );
-        delete tmpNode;
+        element.removeChild( element.firstChild );
     }
 
     if(tmpdoc.cached){
@@ -126,10 +121,7 @@ HTMLParser.parseFragment = function(htmlstring, element){
             tmpNode  = parent.removeChild( parent.firstChild );
             importedNode = element.importNode( tmpNode, true);
             element.appendChild( importedNode );
-            delete tmpNode;
         }
-        delete tmpdoc;
-        delete htmlstring;
     }
 
     // console.log('finished fragment: %s', element.outerHTML);

diff --git a/src/platform/rhino/window.js b/src/platform/rhino/window.js
@@ -48,14 +48,10 @@ Envjs.loadFrame = function(frame, url){
 Envjs.unloadFrame = function(frame){
     var all, length, i;
     try{
-        //clean up all the nodes
-        /*all = frame.contentDocument.all,
-          length = all.length;
-          for(i=0;i<length;i++){
-          all[i].removeEventListeners('*', null, null);
-          delete all.pop();
-          }*/
-        delete frame.contentDocument;
+        //TODO: probably self-referencing structures within a document tree
+        //preventing it from being entirely garbage collected once orphaned.
+        //Should have code to walk tree and break all links between contained
+        //objects.
         frame.contentDocument = null;
         if(frame.contentWindow){
             frame.contentWindow.close();

diff --git a/src/window/window.js b/src/window/window.js
@@ -268,8 +268,6 @@ Window = function(scope, parent, opener){
             //console.log('closing window %s', __windows__[$uuid]);
             try{
                 delete __windows__[$uuid];
-                delete scope;
-                delete this;
             }catch(e){
                 console.log('%s',e);
             }