GM_{Tombloo, Tombfix}: Fix support for Greasemonkey to#23

* Fix a bug that can't access GM_{Tombloo, Tombfix} from User Script on Greasemonkey Close to#23
wantora · Dec 17, 2014 · 17add4a · 17add4a
1 parent f0551c0
commit 17add4a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/xpi/components/tombfix.js b/xpi/components/tombfix.js
@@ -346,17 +346,17 @@
         let gmService = Cc['@greasemonkey.mozdev.org/greasemonkey-service;1'];
 
         if (gmService) {
-          let gm = gmService.getService().wrappedJSObject;
+          let gmGlobal = Cu.getGlobalForObject(
+            gmService.getService().wrappedJSObject
+          );
+
+          env.addAround(gmGlobal, 'createSandbox', (proceed, args) => {
+            var sandbox = proceed(args);
 
-          env.addBefore(gm, 'evalInSandbox', function createGMAPI(...args) {
-            for (let arg of args) {
-              if (typeof arg === 'object') {
-                arg.GM_Tombloo = GM_Tombloo;
-                arg.GM_Tombfix = GM_Tombfix;
+            sandbox.GM_Tombloo = GM_Tombloo;
+            sandbox.GM_Tombfix = GM_Tombfix;
 
-                return;
-              }
-            }
+            return sandbox;
           });
         }
       }