Bug 1195853 - Remove UI migration step that attempts to move the Reload and Stop buttons next to the location bar. r=gijs

This commit is contained in:
Dão Gottwald 2015-08-18 20:26:42 +02:00
parent 060db5cdb6
commit 79ba12bf23

View File

@ -1793,23 +1793,6 @@ BrowserGlue.prototype = {
}
}
if (currentUIVersion < 3) {
// This code merges the reload/stop/go button into the url bar.
let currentset = xulStore.getValue(BROWSER_DOCURL, "nav-bar", "currentset");
// Need to migrate only if toolbar is customized and all 3 elements are found.
if (currentset &&
currentset.indexOf("reload-button") != -1 &&
currentset.indexOf("stop-button") != -1 &&
currentset.indexOf("urlbar-container") != -1 &&
currentset.indexOf("urlbar-container,reload-button,stop-button") == -1) {
currentset = currentset.replace(/(^|,)reload-button($|,)/, "$1$2")
.replace(/(^|,)stop-button($|,)/, "$1$2")
.replace(/(^|,)urlbar-container($|,)/,
"$1urlbar-container,reload-button,stop-button$2");
xulStore.setValue(BROWSER_DOCURL, "nav-bar", "currentset", currentset);
}
}
if (currentUIVersion < 4) {
// This code moves the home button to the immediate left of the bookmarks menu button.
let currentset = xulStore.getValue(BROWSER_DOCURL, "nav-bar", "currentset");