[Pkg-mozext-commits] [greasemonkey] 17/30: Minor fix - throws an error in the Browser Console

[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 ee16b931bbe101b2b2647b58035ea83f2a14467e
Author: janekptacijarabaci <janekptacijarabaci at seznam.cz>
Date:   Fri Nov 6 07:55:23 2015 +0100

    Minor fix - throws an error in the Browser Console
---
 content/install.js      | 2 +-
 modules/remoteScript.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/content/install.js b/content/install.js
index 6174503..e5473de 100644
--- a/content/install.js
+++ b/content/install.js
@@ -86,7 +86,7 @@ function onProgress(aRemoteScript, aEventType, aData) {
 
     document.getElementById('loading').style.display = 'none';
     if (gRemoteScript.errorMessage) {
-      document.documentElement.getButton('extra1').disabled = true;
+      gShowScriptButton.disabled = true;
       document.getElementById('dialogContentBox').style.display = 'none';
       document.getElementById('errorContentBox').style.display = '-moz-box';
       document.getElementById('errorMessage')
diff --git a/modules/remoteScript.js b/modules/remoteScript.js
index 8f27c51..d49d6f9 100644
--- a/modules/remoteScript.js
+++ b/modules/remoteScript.js
@@ -265,7 +265,11 @@ RemoteScript.prototype.cancel = function() {
 
 /** Clean up all temporary files, stop all actions. */
 RemoteScript.prototype.cleanup = function(aErrorMessage) {
-  this.errorMessage = aErrorMessage || null;
+  this.errorMessage = null;
+  // See #2327
+  if (aErrorMessage && ("object" != typeof aErrorMessage)) {
+    this.errorMessage = aErrorMessage;
+  }
   this.done = true;
 
   this._channels.forEach(function(aChannel) {

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