author | Robert Strong <robert.bugzilla@gmail.com> |
Tue, 15 Jun 2010 15:13:47 -0700 | |
changeset 43664 | 9bf041cf98564240c44ebe7460c3a78e1fe0b6a9 |
parent 43663 | 0fbbed29ad5ac95303ab1d38a40767fcc9fe1d7e |
child 43665 | ab2882dd564c98f84ef0a429c41513f330f40d78 |
push id | 13841 |
push user | rstrong@mozilla.com |
push date | Tue, 15 Jun 2010 22:14:16 +0000 |
treeherder | mozilla-central@ab2882dd564c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dtownsend |
bugs | 570066 |
milestone | 1.9.3a6pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -253,22 +253,16 @@ var gUpdates = { }, never: function () { // If the user clicks "No Thanks", we should not prompt them to update to // this version again unless they manually select "Check for Updates..." // which will clear all of the "never" prefs. var neverPrefName = PREF_APP_UPDATE_NEVER_BRANCH + this.update.appVersion; gPref.setBoolPref(neverPrefName, true); - this.wiz.cancel(); - }, - - later: function () { - // The user said "Later", so close the wizard - this.wiz.cancel(); }, /** * A hash of |pageid| attribute to page object. Can be used to dispatch * function calls to the appropriate page. */ _pages: { }, @@ -912,21 +906,22 @@ var gUpdatesFoundBasicPage = { // Clear all of the "never" prefs to handle the scenario where the user // clicked "never" for an update, selected "Check for Updates...", and // then canceled. If we don't clear the "never" prefs future // notifications will never happen. gPref.deleteBranch(PREF_APP_UPDATE_NEVER_BRANCH); }, onExtra1: function() { - gUpdates.later(); + gUpdates.wiz.cancel(); }, onExtra2: function() { gUpdates.never(); + gUpdates.wiz.cancel(); } }; /** * The "Updates Are Available" page with a billboard. Provides the user * information about the available update. */ var gUpdatesFoundBillboardPage = { @@ -998,22 +993,23 @@ var gUpdatesFoundBillboardPage = { var next = gUpdates.wiz.getPageById("updatesfoundbillboard").getAttribute("next"); gUpdates.wiz.getPageById(gUpdates.updatesFoundPageId).setAttribute("next", next); gUpdates.wiz.goTo(gUpdates.updatesFoundPageId); } }, onExtra1: function() { this.onWizardCancel(); - gUpdates.later(); + gUpdates.wiz.cancel(); }, onExtra2: function() { this.onWizardCancel(); gUpdates.never(); + gUpdates.wiz.cancel(); }, /** * When the user cancels the wizard */ onWizardCancel: function() { try { var remoteContent = document.getElementById("updateMoreInfoContent");