Changeset 609

Timestamp:

01/19/08 00:46:13 (10 months ago)

Author:

boo..@youngpup.net

Message:

Fix for issue #85. Also small scriptdownloader refactor to reduce repeated
code to refresh icon and hide message.

Files:

• trunk/src/chrome/chromeFiles/content/browser.js (modified) (1 diff)
• trunk/src/chrome/chromeFiles/content/scriptdownloader.js (modified) (4 diffs)

trunk/src/chrome/chromeFiles/content/browser.js

@@ -576 +576 @@
-};
-
+GM_BrowserUI.hideStatusImmediately = function() {
+  if (this.showAnimation) {
+    this.showAnimation.stop();
+    this.showAnimation = null;
+  }
+
+  if (this.hideAnimation) {
+    this.hideAnimation.stop();
+    this.hideAnimation = null;
+  }
+
+  if (this.autoHideTimer) {
+    window.clearTimeout(this.autoHideTimer);
+    this.autoHideTimer = null;
+  }
+
+  this.statusLabel.style.width = "0";
+  this.statusLabel.collapsed = true;
+};
+
-GM_BrowserUI.hideStatus = function() {
-  if (!this.hideAnimation) {

trunk/src/chrome/chromeFiles/content/scriptdownloader.js

@@ -38 +38 @@
-
-ScriptDownloader.prototype.handleScriptDownloadComplete = function() {
+  this.win_.GM_BrowserUI.refreshStatus();
+  this.win_.GM_BrowserUI.hideStatusImmediately();
+
-  try {
-    // If loading from file, status might be zero on success
-    if (this.req_.status != 200 && this.req_.status != 0) {
-      this.win_.GM_BrowserUI.refreshStatus();
-      this.win_.GM_BrowserUI.hideStatus();
-
-      // NOTE: Unlocalized string
-      alert('Error loading user script:\n' +
@@ -84 +84 @@
-    // NOTE: unlocalized string
-    alert("Script could not be installed " + e);
-    this.win_.GM_BrowserUI.refreshStatus();
-    this.win_.GM_BrowserUI.hideStatus();
-    throw e;
-  }
@@ -219 +217 @@
-    return;
-  }
-  this.win_.GM_BrowserUI.hideStatus();
-  this.win_.GM_BrowserUI.refreshStatus();
-  this.win_.openDialog("chrome://greasemonkey/content/install.xul", "",
-                       "chrome,centerscreen,modal,dialog,titlebar,resizable",
@@ -227 +223 @@
-
-ScriptDownloader.prototype.showScriptView = function() {
-  this.win_.GM_BrowserUI.hideStatus();
-  this.win_.GM_BrowserUI.refreshStatus();
-  this.win_.GM_BrowserUI.showScriptView(this);
-};