Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-18 06:45:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 346757 - Toolbars not shown in toolbar context menu on first open, assertion 'getElementById(''), fix caller?'. patch from Nickolay Ponomarev <asqueella@gmail.com>, r=me/neil, sr=neil.

Browse Source
This commit is contained in:
mozilla.mano%sent.com 2006-10-10 00:05:41 +00:00
parent 67aea777b8
commit 217e108dff
4 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser-menubar.inc
View File

@ -144,7 +144,7 @@
<menupopup id="menu_viewPopup">
<menu id="viewToolbarsMenu" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;"
onpopupshowing="onViewToolbarsPopupShowing(event);">
<menupopup onpopupshowing="updateToolbarStates(this);">
<menupopup>
<menuseparator/>
<menuitem label="&viewCustomizeToolbar.label;" accesskey="&viewCustomizeToolbar.accesskey;"
command="cmd_CustomizeToolbars"/>

27
browser/base/content/browser.js
View File

@ -101,7 +101,6 @@ var gNavigatorBundle = null;
var gIsLoadingBlank = false;
var gLastValidURLStr = "";
var gLastValidURL = null;
var gHaveUpdatedToolbarState = false;
var gClickSelectsAll = false;
var gMustLoadSidebar = false;
var gProgressMeterPanel = null;
@ -2448,32 +2447,6 @@ var urlbarObserver = {
}
}
function updateToolbarStates(toolbarMenuElt)
{
if (!gHaveUpdatedToolbarState) {
var mainWindow = document.getElementById("main-window");
if (mainWindow.hasAttribute("chromehidden")) {
gHaveUpdatedToolbarState = true;
var i;
for (i = 0; i < toolbarMenuElt.childNodes.length; ++i)
document.getElementById(toolbarMenuElt.childNodes[i].getAttribute("observes")).removeAttribute("checked");
var toolbars = document.getElementsByTagName("toolbar");
// Start i at 1, since we skip the menubar.
for (i = 1; i < toolbars.length; ++i) {
if (toolbars[i].getAttribute("class").indexOf("chromeclass") != -1)
toolbars[i].setAttribute("collapsed", "true");
}
var statusbars = document.getElementsByTagName("statusbar");
for (i = 1; i < statusbars.length; ++i) {
if (statusbars[i].getAttribute("class").indexOf("chromeclass") != -1)
statusbars[i].setAttribute("collapsed", "true");
}
mainWindow.removeAttribute("chromehidden");
}
}
}
function BrowserImport()
{
#ifdef XP_MACOSX

2
browser/base/content/browser.xul
View File

@ -106,7 +106,7 @@
<popup type="autocomplete" chromedir="&locale.dir;" id="PopupAutoComplete"/>
<popup id="toolbar-context-menu"
onpopupshowing="updateToolbarStates(this); onViewToolbarsPopupShowing(event);">
onpopupshowing="onViewToolbarsPopupShowing(event);">
<menuseparator/>
<menuitem command="cmd_CustomizeToolbars"
label="&viewCustomizeToolbar.label;"

21
suite/browser/navigator.js
View File

@ -52,7 +52,6 @@ var gNavigatorRegionBundle;
var gBrandRegionBundle;
var gLastValidURLStr = "";
var gLastValidURL = null;
var gHaveUpdatedToolbarState = false;
var gClickSelectsAll = false;
var gClickAtEndSelects = false;
var gIgnoreFocus = false;
@ -2275,26 +2274,6 @@ function updateComponentBarBroadcaster()
function updateToolbarStates(toolbarMenuElt)
{
if (!gHaveUpdatedToolbarState) {
var mainWindow = document.getElementById("main-window");
if (mainWindow.hasAttribute("chromehidden")) {
gHaveUpdatedToolbarState = true;
var i;
for (i = 0; i < toolbarMenuElt.childNodes.length; ++i)
document.getElementById(toolbarMenuElt.childNodes[i].getAttribute("observes")).removeAttribute("checked");
var toolbars = document.getElementsByTagName("toolbar");
for (i = 0; i < toolbars.length; ++i) {
if (toolbars[i].getAttribute("class").indexOf("chromeclass") != -1)
toolbars[i].setAttribute("hidden", "true");
}
var statusbars = document.getElementsByTagName("statusbar");
for (i = 0; i < statusbars.length; ++i) {
if (statusbars[i].getAttribute("class").indexOf("chromeclass") != -1)
statusbars[i].setAttribute("hidden", "true");
}
mainWindow.removeAttribute("chromehidden");
}
}
updateComponentBarBroadcaster();
const tabbarMenuItem = document.getElementById("menuitem_showhide_tabbar");