author | Hector Zhao <bzhao@mozilla.com> |
Wed, 14 Jan 2015 17:39:01 +0800 | |
changeset 224325 | a9240b1eb2fb0096c82d9c0874096a228f7e707c |
parent 224324 | 0f3b187814d7df01b8155ac8ee14fdd2ab87a6bf |
child 224326 | f24c203c43f37bb3fa36138b9095c869b34edf95 |
push id | 54190 |
push user | kwierso@gmail.com |
push date | Sat, 17 Jan 2015 02:06:29 +0000 |
treeherder | mozilla-inbound@369a8f14ccf8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | felipe |
bugs | 1035400 |
milestone | 38.0a1 |
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
|
browser/base/content/aboutDialog.js | file | annotate | diff | comparison | revisions | |
toolkit/mozapps/update/nsUpdateService.js | file | annotate | diff | comparison | revisions |
--- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -485,17 +485,17 @@ appUpdater.prototype = return; if (this.addons.length == 0) { // Compatibility updates or new version updates were found for all add-ons this.startDownload(); return; } - this.selectPanel("apply"); + this.selectPanel("applyBillboard"); }, /** * Starts the download of an update mar. */ startDownload: function() { if (!this.update) this.update = this.um.activeUpdate;
--- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -3018,18 +3018,18 @@ UpdateService.prototype = { return; // If the new version of this add-on is blocklisted for the new application // then it isn't a valid update and the user should still be warned that // the add-on will become incompatible. let bs = Cc["@mozilla.org/extensions/blocklist;1"]. getService(Ci.nsIBlocklistService); if (bs.isAddonBlocklisted(addon, - gUpdates.update.appVersion, - gUpdates.update.platformVersion)) + this._update.appVersion, + this._update.platformVersion)) return; // Compatibility or new version updates mean the same thing here. this.onCompatibilityUpdateAvailable(addon); }, onUpdateFinished: function(addon) { if (--this._updateCheckCount > 0)