fix execute async script

the timeout needs to be after the script is called so that the asynchronous script provided by the user can be called before the timeout script in the case where both timeouts are equal

the test doesn't need 100ms, 10 will suffice.

Author: lukeis

java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java

@@ -241,10 +241,10 @@ public void shouldCatchErrorsWhenExecutingInitialScript() {
   @Test
   public void shouldNotTimeoutWithMultipleCallsTheFirstOneBeingSynchronous() {
     driver.get(pages.ajaxyPage);
-    driver.manage().timeouts().setScriptTimeout(100, TimeUnit.MILLISECONDS);
+    driver.manage().timeouts().setScriptTimeout(10, TimeUnit.MILLISECONDS);
     assertTrue((Boolean) executor.executeAsyncScript("arguments[arguments.length - 1](true);"));
     assertTrue((Boolean) executor.executeAsyncScript(
-        "var cb = arguments[arguments.length - 1]; window.setTimeout(function(){cb(true);}, 99);"));
+        "var cb = arguments[arguments.length - 1]; window.setTimeout(function(){cb(true);}, 9);"));
   }
 
   @JavascriptEnabled

javascript/firefox-driver/js/evaluate.js

@@ -34,6 +34,7 @@ limitations under the License.
       if (isAsync) {
         window.clearTimeout(timeoutId);
         window.removeEventListener('unload', onunload, false);
+        timeoutId = true;
       }
 
       document.__webdriver_evaluate['args'] = null;
@@ -65,16 +66,19 @@ limitations under the License.
 
     var startTime = new Date().getTime();
     try {
-      if (isAsync) {
-        timeoutId = window.setTimeout(function() {
-          sendResponse(
-              Error('Timed out waiting for async script result after ' +
-                    (new Date().getTime() - startTime) + 'ms'),
-              28);  // "script timeout" == 28
-        }, timeout);
-      }
       var result = new Function(script).apply(null, args);
-      if (!isAsync) {
+      if (isAsync) {
+        // if the callback method is called synchronously in the provided script
+        // don't set a timeout function, since the timeout has already been 'cleared'
+        if (!timeoutId) {
+          timeoutId = window.setTimeout(function() {
+            sendResponse(
+                Error('Timed out waiting for async script result after ' +
+                      (new Date().getTime() - startTime) + 'ms'),
+                28);  // "script timeout" == 28
+          }, timeout);
+        }
+      } else {
         sendResponse(result, 0);
       }
     } catch (e) {