Patch for PhantomJS setTimout/setInterval issue

Trying a patch suggested at the phantomjs github repo issues ariya/phantomjs#10832
SergioCrisostomo · Feb 21, 2014 · 22c7812 · 22c7812
1 parent 13eecf7
commit 22c7812
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Specs/1.2/Core/Core.js b/Specs/1.2/Core/Core.js
@@ -83,12 +83,12 @@ describe('$chk', {
 describe('$clear', {
 
 	'should clear timeouts': function(){
-		var timeout = setTimeout(function(){}, 100);
+		var timeout = setTimeout( function(){setTimeout(function(){}, 100); }),0);
 		expect($clear(timeout)).toBeNull();
 	},
 
 	'should clear intervals': function(){
-		var interval = setInterval(function(){}, 100);
+		var interval = setInterval(function(){setInterval(function(){}, 100);}, 0);
 		expect($clear(interval)).toBeNull();
 	}
 

diff --git a/Specs/1.3client/Utilities/DOMReady.php b/Specs/1.3client/Utilities/DOMReady.php
@@ -196,7 +196,7 @@ function pollDoScroll(){
 	window.CANSCROLL = PASS
 	somethingHappened('TEST_ELEMENT.doScroll()', PASS)
 
-	if (!PASS) setTimeout(pollDoScroll, 10)
+	if (!PASS) setTimeout(function(){setTimeout(pollDoScroll, 10)}, 0)
 }
 
 function pollDoScroll_body(){
@@ -213,7 +213,7 @@ function pollDoScroll_body(){
 
 	somethingHappened('document.body.doScroll()', PASS)
 
-	if (!PASS) setTimeout(pollDoScroll_body, 10)
+	if (!PASS) setTimeout(function(){setTimeout(pollDoScroll_body, 10)},0)
 }
 
 var lastReadyState
@@ -222,7 +222,7 @@ function pollReadyState(){
 	if (!readyState) return
 	if (readyState == lastReadyState) return
 	somethingHappened('poll document.readyState', readyState)
-	if (readyState != 'complete' && readyState != 'loaded') setTimeout(pollReadyState, 10)
+	if (readyState != 'complete' && readyState != 'loaded') setTimeout(function(){setTimeout(pollReadyState, 10)}, 0)
 	lastReadyState = readyState
 }
 
@@ -237,7 +237,7 @@ function pollBodyExists(){
 		PASS = false
 	}
 	somethingHappened('body Exists?', PASS? 'YES':'NO')
-	if (!window.ONLOAD) setTimeout(pollBodyExists, 10)
+	if (!window.ONLOAD) setTimeout(function(){setTimeout(pollBodyExists, 10)}, 0)
 }
 
 function pollAugmentBody(){
@@ -254,7 +254,7 @@ function pollAugmentBody(){
 		PASS = false
 	}
 	somethingHappened('can Augment Body?', PASS? 'YES':'NO')
-	if (!window.ONLOAD) setTimeout(pollAugmentBody, 10)
+	if (!window.ONLOAD) setTimeout(function(){setTimeout(pollAugmentBody, 10)}, 0)
 }
 
 // //  //  //  //  //  //  //  //  //  //  //  //  //  //  //  //  //  //  // //
@@ -342,7 +342,7 @@ function poll(){
 	})
 
 	if (hasDifferentResults) readyTestResults.push(results)
-	if (!window.ONLOAD) setTimeout(poll, 10)
+	if (!window.ONLOAD) setTimeout(function(){setTimeout(poll, 10)}, 0)
 	else report()
 }