Download dependencies of scripts installed from the clipboard.

Fixes #1699.
greasemonkey · Feb 1, 2013 · 14c638d · 14c638d
1 parent 6b2d6a6
commit 14c638d
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/modules/util/installScriptFromSource.js b/modules/util/installScriptFromSource.js
@@ -1,3 +1,4 @@
+Components.utils.import('resource://greasemonkey/GM_notification.js');
 Components.utils.import('resource://greasemonkey/parseScript.js');
 Components.utils.import('resource://greasemonkey/remoteScript.js');
 Components.utils.import('resource://greasemonkey/util.js');
@@ -12,9 +13,21 @@ function installScriptFromSource(aSource, aCallback) {
   GM_util.writeToFile(aSource, tempFile, function() {
     // install this script
     remoteScript.setScript(script, tempFile);
-    remoteScript.install();
-    // and fire up the editor!
-    GM_util.openInEditor(script);
+    remoteScript.download(function(aSuccess){
+      if (!aSuccess) {
+        GM_notification(
+            'Could not download script\'s dependencies: '
+            + remoteScript.errorMessage,
+        'dependency-download-failed');
+        return;
+      }
+
+      remoteScript.install();
+
+      // and fire up the editor!
+      GM_util.openInEditor(script);
+
+      if (aCallback) aCallback();
+    });
   });
-  if (aCallback) aCallback();
 }