[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 06/12: Issue 3962 - Update developer tools module paths in Element Hiding Helper

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus-element-hiding-helper.

commit f05e3c62d551eddb29f261a67645cf62d487b88f
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Apr 20 19:53:17 2016 +0200

    Issue 3962 - Update developer tools module paths in Element Hiding Helper
---
 chrome/content/processScript.js | 25 +++++++++++++++++++++++--
 lib/inspectorObserver.js        | 17 +++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/chrome/content/processScript.js b/chrome/content/processScript.js
index abf33e1..c2feedc 100644
--- a/chrome/content/processScript.js
+++ b/chrome/content/processScript.js
@@ -7,8 +7,29 @@
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
-let {DebuggerServer} = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
+let console;
+try
+{
+  // Gecko 44+
+  ({console} = Cu.import("resource://gre/modules/Console.jsm", {}));
+}
+catch (e)
+{
+  ({console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {}));
+}
+
+let DebuggerServer;
+try
+{
+  // Firefox 44+
+  let {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
+  ({DebuggerServer} = require("devtools/server/main"));
+}
+catch (e)
+{
+  ({DebuggerServer} = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}));
+}
+
 let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
 let processID = Services.appinfo.processID;
diff --git a/lib/inspectorObserver.js b/lib/inspectorObserver.js
index 2aea535..e8899c9 100644
--- a/lib/inspectorObserver.js
+++ b/lib/inspectorObserver.js
@@ -11,12 +11,21 @@ let InspectorObserver =
     let gDevTools;
     try
     {
-      ({gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", null));
+      // Firefox 44+
+      ({gDevTools} = Cu.import("resource://devtools/client/framework/gDevTools.jsm", null));
     }
-    catch(e)
+    catch (e)
     {
-      // No developer tools or unsupported version - ignore.
-      return;
+      try
+      {
+        // Older Firefox versions
+        ({gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", null));
+      }
+      catch(e)
+      {
+        // No developer tools or unsupported version - ignore.
+        return;
+      }
     }
 
     gDevTools.on("inspector-ready", this.inspectorReady);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus-element-hiding-helper.git