[Pkg-mozext-commits] [greasemonkey] 03/30: Migrate DevTools resources to resource://devtools/ URLs

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit df7654bb44ba9b08e6b7e86edab107b20d573f58
Author: janekptacijarabaci <janekptacijarabaci at seznam.cz>
Date:   Thu Oct 22 20:07:58 2015 +0200

    Migrate DevTools resources to resource://devtools/ URLs
---
 modules/util/openInEditor.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/util/openInEditor.js b/modules/util/openInEditor.js
index 20d07e6..699c3f5 100644
--- a/modules/util/openInEditor.js
+++ b/modules/util/openInEditor.js
@@ -1,10 +1,17 @@
 var EXPORTED_SYMBOLS = ['openInEditor'];
 
 try {
-  Components.utils.import("resource:///modules/devtools/scratchpad-manager.jsm");
+  Components.utils.import("resource://devtools/client/scratchpad/scratchpad-manager.jsm");
 } catch (e) {
-  // Moved in Firefox 44; see: http://hg.mozilla.org/mozilla-central/rev/3b90d45a2bbc
-  Components.utils.import("resource:///modules/devtools/client/scratchpad/scratchpad-manager.jsm");
+  try {
+    // Moved in Firefox 44
+    // See: http://hg.mozilla.org/mozilla-central/rev/397c69fa1677
+    Components.utils.import("resource:///modules/devtools/client/scratchpad/scratchpad-manager.jsm");
+  } catch (e) {
+    // Moved in Firefox 44
+    // See: http://hg.mozilla.org/mozilla-central/rev/3b90d45a2bbc
+    Components.utils.import("resource:///modules/devtools/scratchpad-manager.jsm");
+  }
 }
 Components.utils.import('chrome://greasemonkey-modules/content/prefmanager.js');
 Components.utils.import('chrome://greasemonkey-modules/content/util.js');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git