Incorporating changes by kguelzau

Comment thread: mootools#2329 Pull request: mootools#2476
okolvik · Mar 28, 2013 · f4b1c51 · kguelzau · May 22, 2013 · okolvik
1 parent 96b4253
commit f4b1c51
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Source/Browser/Browser.js b/Source/Browser/Browser.js
@@ -161,8 +161,10 @@ if (document.execCommand) try {
 /*<ltIE9>*/
 if (this.attachEvent && !this.addEventListener){
 	var unloadEvent = function(){
-		this.detachEvent('onunload', unloadEvent);
-		document.head = document.html = document.window = this.Window = this.Document = null;
+	  this.detachEvent('onunload', unloadEvent);
+	  document.head = document.html = document.window;
+	  // cleanup scope vars
+	  window = this.Window = document = null;
 	};
 	this.attachEvent('onunload', unloadEvent);
 }

diff --git a/Source/Utilities/DOMReady.js b/Source/Utilities/DOMReady.js
@@ -24,13 +24,15 @@ var ready,
 	testElement = document.createElement('div');
 
 var domready = function(){
-	clearTimeout(timer);
-	if (ready) return;
-	Browser.loaded = ready = true;
-	document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
-	testElement = null;
-	document.fireEvent('domready');
-	window.fireEvent('domready');
+  clearTimeout(timer);
+  if (!ready) {
+    Browser.loaded = ready = true;
+    document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
+    document.fireEvent('domready');
+    window.fireEvent('domready');
+  }
+  // cleanup scope vars
+  document = window = testElement = null;
 };
 
 var check = function(){