зеркало из https://github.com/mozilla/gecko-dev.git
Bug 724821 - Firefox menu bar becomes disabled after toggling toolbars while 'Customize Toolbars' dialog open. r=mak77
This commit is contained in:
Родитель
ccc05b5328
Коммит
58983e2e74
|
@ -1109,10 +1109,13 @@ let PlacesToolbarHelper = {
|
|||
return;
|
||||
|
||||
// If the bookmarks toolbar item is hidden because the parent toolbar is
|
||||
// collapsed or hidden (i.e. in a popup), spare the initialization.
|
||||
// collapsed or hidden (i.e. in a popup), spare the initialization. Also,
|
||||
// there is no need to initialize the toolbar if customizing because
|
||||
// init() will be called when the customization is done.
|
||||
let toolbar = viewElt.parentNode.parentNode;
|
||||
if (toolbar.collapsed ||
|
||||
getComputedStyle(toolbar, "").display == "none")
|
||||
getComputedStyle(toolbar, "").display == "none" ||
|
||||
this._isCustomizing)
|
||||
return;
|
||||
|
||||
new PlacesToolbar(this._place);
|
||||
|
@ -1122,9 +1125,12 @@ let PlacesToolbarHelper = {
|
|||
let viewElt = this._viewElt;
|
||||
if (viewElt && viewElt._placesView)
|
||||
viewElt._placesView.uninit();
|
||||
|
||||
this._isCustomizing = true;
|
||||
},
|
||||
|
||||
customizeDone: function PTH_customizeDone() {
|
||||
this._isCustomizing = false;
|
||||
this.init();
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
function test() {
|
||||
waitForExplicitFinish();
|
||||
ignoreAllUncaughtExceptions();
|
||||
|
||||
// test the main (normal) browser window
|
||||
testCustomize(window, testChromeless);
|
||||
}
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
function test() {
|
||||
waitForExplicitFinish();
|
||||
ignoreAllUncaughtExceptions();
|
||||
|
||||
testCustomize(window, finish);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
function test()
|
||||
{
|
||||
waitForExplicitFinish();
|
||||
ignoreAllUncaughtExceptions();
|
||||
var frame = document.getElementById("customizeToolbarSheetIFrame");
|
||||
frame.addEventListener("load", testCustomizeFrameLoadedPre, true);
|
||||
|
||||
|
|
|
@ -92,6 +92,7 @@
|
|||
var os = Components.classes["@mozilla.org/observer-service;1"]
|
||||
.getService(Components.interfaces.nsIObserverService);
|
||||
os.removeObserver(this, "browser-search-engine-modified");
|
||||
this._addedObserver = false;
|
||||
}
|
||||
|
||||
// Make sure to break the cycle from _textbox to us. Otherwise we leak
|
||||
|
|
Загрузка…
Ссылка в новой задаче