author | Brian Grinstead <bgrinstead@mozilla.com> |
Mon, 19 Jun 2017 13:45:03 -0700 | |
changeset 365067 | e5fb1c36d5d6fc4420d4d9afa324e2b33cf6dd08 |
parent 365066 | 0ab5db5483c357078324e07d88d3dd75d2c135fb |
child 365068 | 034c0bb6fb56fe265f3929dbad480c8d8476eebf |
push id | 91680 |
push user | kwierso@gmail.com |
push date | Wed, 21 Jun 2017 01:32:01 +0000 |
treeherder | mozilla-inbound@f7b9dc31956c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | Gijs |
bugs | 1372954 |
milestone | 56.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/browser-sidebar.js | file | annotate | diff | comparison | revisions | |
browser/components/nsBrowserGlue.js | file | annotate | diff | comparison | revisions |
--- a/browser/base/content/browser-sidebar.js +++ b/browser/base/content/browser-sidebar.js @@ -63,17 +63,16 @@ var SidebarUI = { }); }, uninit() { let enumerator = Services.wm.getEnumerator(null); enumerator.getNext(); if (!enumerator.hasMoreElements()) { document.persist("sidebar-box", "sidebarcommand"); - document.persist("sidebar-box", "checked"); document.persist("sidebar-box", "width"); document.persist("sidebar-title", "value"); } }, /** * Opens the switcher panel if it's closed, or closes it if it's open. */
--- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -1711,17 +1711,17 @@ BrowserGlue.prototype = { return; this._openPreferences("sync", { origin: "doorhanger" }); } AlertsService.showAlertNotification(null, title, body, true, null, clickCallback); }, // eslint-disable-next-line complexity _migrateUI: function BG__migrateUI() { - const UI_VERSION = 47; + const UI_VERSION = 48; const BROWSER_DOCURL = "chrome://browser/content/browser.xul"; let currentUIVersion; if (Services.prefs.prefHasUserValue("browser.migration.version")) { currentUIVersion = Services.prefs.getIntPref("browser.migration.version"); } else { // This is a new profile, nothing to migrate. Services.prefs.setIntPref("browser.migration.version", UI_VERSION); @@ -2041,16 +2041,24 @@ BrowserGlue.prototype = { // In this case just fallback to the safest side and disable suggestions. Services.prefs.setBoolPref("browser.urlbar.suggest.searches", false); } } catch (ex) { // A missing pref is not a fatal error. } } + if (currentUIVersion < 48) { + // Bug 1372954 - the checked value was persisted but the attribute removal wouldn't + // be persisted (Bug 15232). Turns out we can just not persist the value in this case. + // The situation was only happening for a few nightlies in 56, so this migration can + // be removed in version 58. + xulStore.removeValue(BROWSER_DOCURL, "sidebar-box", "checked"); + } + // Update the migration version. Services.prefs.setIntPref("browser.migration.version", UI_VERSION); }, // ------------------------------ // public nsIBrowserGlue members // ------------------------------