Merge pull request #87 from rpl/fix/syntax-error-related-to-bug-1272784

fix: fixed SyntaxError in frame-script.js (due to Bug 1272784).

Author: janodvarko

data/inspector/frame-script.js

@@ -1,16 +1,17 @@
 /* See license.txt for terms of usage */
 
-(function({
+(function(global) {
+
+"use strict";
+
+const {
   Components,
   content,
   addEventListener,
   sendAsyncMessage,
   addMessageListener,
-  /*removeMessageListener*/
-}) {
-
-"use strict";
-
+  /*removeMessageListener,*/
+} = global;
 
 const Cu = Components.utils;
 /*const Cc = Components.classes;

lib/inspector-actor.js

@@ -26,13 +26,15 @@ function safeImport(...args) {
   return {};
 }
 
-function safeRequire(devtools, ...args) {
-  for (var i=0; i<args.length; i++) {
+function safeRequire(devtoolsLoader, ...args) {
+  for (var i = 0; i < args.length; i++) {
     try {
-      return devtools["require"](args[i]);
+      return devtoolsLoader["require"](args[i]);
     }
+    /* eslint-disable */
     catch (err) {
     }
+    /* eslint-enable */
   }
   return {};
 }