wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 417421 - "Loss of back forward buttons when switching between 1.8 and 1.9" (don't add unified-back-forward-button if it's already there (due to the change on branch)) [p=dao@mozilla.com (Dão Gottwald) r=gavin a=blocking-firefox3+]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-03-08 03:37:19 -08:00
parent 9ab8657f45
commit 73bce5a195
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/components/nsBrowserGlue.js
View File

@ -451,6 +451,7 @@ BrowserGlue.prototype = {
var collapsed = this._rdf.GetResource("collapsed"); var collapsed = this._rdf.GetResource("collapsed");
var target; var target;
var moveHome; var moveHome;
var homePattern = /(?:^|,)home-button(?:$|,)/;
// get an nsIRDFResource for the PersonalToolbar item // get an nsIRDFResource for the PersonalToolbar item
var personalBar = this._rdf.GetResource("chrome://browser/content/browser.xul#PersonalToolbar"); var personalBar = this._rdf.GetResource("chrome://browser/content/browser.xul#PersonalToolbar");
@ -460,15 +461,19 @@ BrowserGlue.prototype = {
var navBar = this._rdf.GetResource("chrome://browser/content/browser.xul#nav-bar"); var navBar = this._rdf.GetResource("chrome://browser/content/browser.xul#nav-bar");
target = this._getPersist(navBar, currentSet); target = this._getPersist(navBar, currentSet);
if (target) { if (target) {
let originalTarget = target;
// move Home if we find it in the nav-bar and the personal toolbar isn't collapsed // move Home if we find it in the nav-bar and the personal toolbar isn't collapsed
moveHome = !personalBarCollapsed && (target.indexOf("home-button") != -1); if (!personalBarCollapsed)
if (moveHome) target = target.replace(homePattern, ",");
target = target.replace("home-button", ""); moveHome = (target != originalTarget);
// add the new combined back and forward button // add the new combined back and forward button
target = "unified-back-forward-button," + target; if (!/(?:^|,)unified-back-forward-button(?:$|,)/.test(target))
target = "unified-back-forward-button," + target;
this._setPersist(navBar, currentSet, target); if (target != originalTarget)
this._setPersist(navBar, currentSet, target);
} else { } else {
// nav-bar doesn't have a currentset, so the defaultset will be used, // nav-bar doesn't have a currentset, so the defaultset will be used,
// which means Home will be moved // which means Home will be moved
@ -479,7 +484,7 @@ BrowserGlue.prototype = {
// If the personal toolbar has a currentset, add Home. The defaultset will be // If the personal toolbar has a currentset, add Home. The defaultset will be
// used otherwise. // used otherwise.
target = this._getPersist(personalBar, currentSet); target = this._getPersist(personalBar, currentSet);
if (target && target.indexOf("home-button") == -1) if (target && !homePattern.test(target))
this._setPersist(personalBar, currentSet, "home-button," + target); this._setPersist(personalBar, currentSet, "home-button," + target);
// uncollapse the personal toolbar // uncollapse the personal toolbar