Do not treat user cancel action as a download failure.

Fixes #1862
greasemonkey · Jul 31, 2014 · 8412f3d · 8412f3d
1 parent 4dd733c
commit 8412f3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/content/install.js b/content/install.js
@@ -58,7 +58,7 @@ function onBlur(e) {
 }
 
 function onCancel() {
-  gRemoteScript.cleanup();
+  gRemoteScript.cancel();
   window.close();
 }
 

diff --git a/modules/remoteScript.js b/modules/remoteScript.js
@@ -231,6 +231,7 @@ DownloadListener.prototype = {
 
 function RemoteScript(aUrl) {
   this._baseName = null;
+  this._cancelled = false;
   this._channels = [];
   this._dependencies = [];
   this._metadata = null;
@@ -253,6 +254,11 @@ function RemoteScript(aUrl) {
 RemoteScript.prototype.__defineGetter__(
     'url', function() { return new String(this._url); });
 
+RemoteScript.prototype.cancel = function() {
+  this._cancelled = true;
+  this.cleanup();
+};
+
 /** Clean up all temporary files, stop all actions. */
 RemoteScript.prototype.cleanup = function(aErrorMessage) {
   this.errorMessage = aErrorMessage || null;
@@ -284,7 +290,7 @@ RemoteScript.prototype.download = function(aCompletionCallback) {
   } else {
     this.downloadScript(GM_util.hitch(this, function(aSuccess, aPoint) {
       if (aSuccess) this._downloadDependencies(aCompletionCallback);
-      aCompletionCallback(aSuccess, aPoint);
+      aCompletionCallback(this._cancelled || aSuccess, aPoint);
     }));
   }
 };