Skip to content
This repository
Browse code

Fix alert + setTimeout in grant none case.

Fixes #1620
Refs #1318
Refs #1350
  • Loading branch information...
commit 139ce97b1ab44607003b33751210b7edf16744ce 1 parent e7d86d4
arantius authored September 06, 2012

Showing 1 changed file with 6 additions and 0 deletions. Show diff stats Hide diff stats

  1. 6  components/greasemonkey.js
6  components/greasemonkey.js
@@ -122,6 +122,12 @@ function createSandbox(
122 122
     Components.utils.evalInSandbox(
123 123
         'const unsafeWindow = window;', contentSandbox);
124 124
 
  125
+    if (GM_util.compareFirefoxVersion("16.0") < 0) {
  126
+      // See #1350.  The upstream bug was fixed in Firefox 16; apply workaround
  127
+      // only in older versions.
  128
+      contentSandbox.alert = alert;
  129
+    }
  130
+
125 131
     return contentSandbox;
126 132
   }
127 133
 

0 notes on commit 139ce97

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