Skip to content
Browse files

Revert "Inject a custom setTimeout method into the sandbox."

This reverts commit 7eccacb.

Fixes #1549, #1552, #1553
Refs #1209
1 parent 21c24f0 commit 88b901995f6fd162a96f0710a98d16074cb0746e @arantius committed May 11, 2012
Showing with 0 additions and 8 deletions.
  1. +0 −8 components/greasemonkey.js
View
8 components/greasemonkey.js
@@ -112,11 +112,6 @@ function createSandbox(
imp(GM_util.hitch(scriptResources, 'getResourceURL'), 'GM_getResourceURL');
imp(GM_util.hitch(scriptResources, 'getResourceText'), 'GM_getResourceText');
- // Import bare setTimeout (see #1209), and alias it inside the window object.
- imp(GM_util.hitch(null, GM_util.timeout), 'setTimeout');
- Components.utils.evalInSandbox(
- 'window.setTimeout = setTimeout;', sandbox);
-
// The .importMethod() is safe because it can't return object values (I
// think?) -- but sometimes we want to, so in that case do a straight assign.
// TODO: When minVer=4 check if this is still necessary.
@@ -338,9 +333,6 @@ function startup() {
}
loadGreasemonkeyVersion();
-
- // Guarantee this getter-powered reference is set up.
- GM_util.timeout(function() {}, 0);
}
/////////////////////////////////// Service ////////////////////////////////////

0 comments on commit 88b9019

Please sign in to comment.
Something went wrong with that request. Please try again.