Basic support for drag/drop user scripts on the addons window to inst…

…all. Fixes #1142
greasemonkey · Jul 4, 2010 · dd22c58 · dd22c58
1 parent 897fb56
commit dd22c58
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 29 deletions.
diff --git a/components/greasemonkey.js b/components/greasemonkey.js
@@ -171,16 +171,11 @@ var greasemonkeyService = {
       dump("shouldload: " + cl.spec + "\n");
       dump("ignorescript: " + this.ignoreNextScript_ + "\n");
 
-      if (!this.ignoreNextScript_) {
-        if (!this.isTempScript(cl)) {
-          var win = Cc['@mozilla.org/appshell/window-mediator;1']
-            .getService(Ci.nsIWindowMediator)
-            .getMostRecentWindow("navigator:browser");
-          if (win && win.GM_BrowserUI) {
-            win.GM_BrowserUI.startInstallScript(cl);
-            ret = Ci.nsIContentPolicy.REJECT_REQUEST;
-          }
-        }
+      if (!this.ignoreNextScript_
+        && !this.isTempScript(cl)
+        && GM_installUri(cl)
+      ) {
+        ret = Ci.nsIContentPolicy.REJECT_REQUEST;
       }
     }
 

diff --git a/content/addons.js b/content/addons.js
@@ -63,11 +63,10 @@ window.addEventListener('load', function() {
       'select', greasemonkeyAddons.updateLastSelected, false);
   gUserscriptsView.addEventListener(
       'keypress', greasemonkeyAddons.onKeypress, false);
-  gUserscriptsView.addEventListener(
-      'dragenter', greasemonkeyAddons.onDragEnter, false);
-  gUserscriptsView.addEventListener(
+
+  window.addEventListener(
       'dragover', greasemonkeyAddons.onDragOver, false);
-  gUserscriptsView.addEventListener(
+  window.addEventListener(
       'drop', greasemonkeyAddons.onDrop, false);
 
   GM_config.addObserver(observer);
@@ -124,29 +123,34 @@ var greasemonkeyAddons = {
     gExtensionsView.focus();
   },
 
-  onDragEnter: function(event) {
-    event.preventDefault();
+  urlFromDragEvent: function(event) {
+    var types = event.dataTransfer.types;
+    var url = null;
+    if (types.contains('text/uri-list')) {
+      url = event.dataTransfer.mozGetDataAt('text/uri-list', 0);
+    } else if (types.contains('application/x-moz-file')) {
+      var file = event.dataTransfer
+          .mozGetDataAt('application/x-moz-file', 0)
+          .QueryInterface(Components.interfaces.nsIFile);
+      url = GM_getUriFromFile(file).spec;
+    }
+    return url;
   },
 
   onDragOver: function(event) {
-    var types = event.dataTransfer.types;
-    var supportedTypes = ["text/x-moz-url"];
-    var requiredExtension = ".user.js";
-    types = supportedTypes.filter(function (value) types.contains(value));
-    if (types.length) {
-      var data = event.dataTransfer.getData(types[0]);
-      if (data.lastIndexOf(requiredExtension) == data.length-requiredExtension.length) {
-        event.preventDefault();
-      }
+    var url = greasemonkeyAddons.urlFromDragEvent(event);
+    if (url && url.match(/\.user\.js$/)) {
+      // Cancel the default do-not-allow behavior.
+      event.preventDefault();
     }
   },
 
   onDrop: function(event) {
-    //is validated during onDragOver (above)
-    var scriptURI = event.dataTransfer.getData("text/x-moz-url");
-    alert("NEXT STEP: Install this .user.js script: \n\n" + scriptURI);
+    var uri = GM_uriFromUrl(greasemonkeyAddons.urlFromDragEvent(event));
+    // TODO: Make this UI appear attached to addons, rather than the browser?
+    GM_installUri(uri);
   },
-
+  
   updateLastSelected: function() {
     if (!gUserscriptsView.selectedItem) return;
     var userscriptsRadio = document.getElementById('userscripts-view');

diff --git a/content/addons.xul b/content/addons.xul
@@ -18,6 +18,7 @@
 
 <script type="application/x-javascript" src="chrome://greasemonkey/content/utils.js" />
 <script type="application/x-javascript" src="chrome://greasemonkey/content/prefmanager.js" />
+<script type="application/x-javascript" src="chrome://greasemonkey/content/scriptdownloader.js" />
 <script type="application/x-javascript" src="chrome://greasemonkey/content/addons.js" />
 
 <radiogroup id="viewGroup">

diff --git a/content/utils.js b/content/utils.js
@@ -361,6 +361,17 @@ function GM_sha1(unicode) {
 }
 GM_sha1 = GM_memoize(GM_sha1);
 
+function GM_installUri(uri) {
+  var win = Cc['@mozilla.org/appshell/window-mediator;1']
+    .getService(Ci.nsIWindowMediator)
+    .getMostRecentWindow("navigator:browser");
+  if (win && win.GM_BrowserUI) {
+    win.GM_BrowserUI.startInstallScript(uri);
+    return true;
+  }
+  return false;
+}
+
 // Decorate a function with a memoization wrapper, with a limited-size cache
 // to reduce peak memory utilization.  Simple usage:
 //