Bug 424995 - "remove countdown timer from software update UI" [p=dao@mozilla.com (Dão Gottwald) r=mconnor a=blocking-firefox3+]

toolkit/mozapps/update/content/updates.js

@@ -1567,17 +1567,14 @@ var gErrorsPage = {
 var gFinishedPage = {
   /**
    * Called to initialize the Wizard Page.
-   * @param   aDelayRestart
-   *          true if the Restart Application button should be disabled for a
-   *          short delay
    */
-  onPageShow: function(aDelayRestart) {
-    gUpdates.setButtons(null, true, null, true, "restartButton", aDelayRestart,
+  onPageShow: function() {
+    gUpdates.setButtons(null, true, null, true, "restartButton", false,
                         "notNowButton", false, false, null, false, null, false);
-    if (aDelayRestart)
-      setTimeout(this._enableRestartButton, 2000);
-    else
+    //XXX bug 426021
+    setTimeout(function () {
       gUpdates.wiz.getButton("finish").focus();
+    }, 0);
   },
 
   /**
@@ -1595,26 +1592,15 @@ var gFinishedPage = {
     var link = document.getElementById("finishedBackgroundLink");
     link.href = gUpdates.update.detailsURL;
 
-    this.onPageShow(true);
+    this.onPageShow();
 
     if (getPref("getBoolPref", PREF_UPDATE_TEST_LOOP, false)) {
-      window.restart = function () {
-        gUpdates.wiz.getButton("finish").click();
-      }
-      setTimeout("restart();", UPDATE_TEST_LOOP_INTERVAL);
+      setTimeout(function () {
+                   gUpdates.wiz.getButton("finish").click();
+                 }, UPDATE_TEST_LOOP_INTERVAL);
     }
   },
 
-  /**
-   * Re-enables and focuses the Restart Application button
-   */
-  _enableRestartButton: function() {
-    gUpdates.wiz.canAdvance = true;
-    var finishButton = gUpdates.wiz.getButton("finish");
-    finishButton.disabled = false;
-    finishButton.focus();
-  },
-
   /**
    * Called when the wizard finishes, i.e. the "Restart Now" button is
    * clicked.