[Pkg-mozext-commits] [greasemonkey] 16/55: Import scratchpad manager from new location.

[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 bbb336417c190cafedba5cb09084d250759293bb
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Wed Sep 23 09:46:26 2015 -0400

    Import scratchpad manager from new location.
    
    Fixes #2285
---
 modules/util/openInEditor.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/util/openInEditor.js b/modules/util/openInEditor.js
index a461628..20d07e6 100644
--- a/modules/util/openInEditor.js
+++ b/modules/util/openInEditor.js
@@ -1,8 +1,14 @@
-Components.utils.import("resource:///modules/devtools/scratchpad-manager.jsm");
+var EXPORTED_SYMBOLS = ['openInEditor'];
+
+try {
+  Components.utils.import("resource:///modules/devtools/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");
+}
 Components.utils.import('chrome://greasemonkey-modules/content/prefmanager.js');
 Components.utils.import('chrome://greasemonkey-modules/content/util.js');
 
-var EXPORTED_SYMBOLS = ['openInEditor'];
 
 var COULD_NOT_LAUNCH = (function() {
   var stringBundle = Components
@@ -12,6 +18,7 @@ var COULD_NOT_LAUNCH = (function() {
   return stringBundle.GetStringFromName("editor.could_not_launch");
 })();
 
+
 function openInEditor(script) {
   var editor = GM_util.getEditor();
   if (!editor) {

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