зеркало из https://github.com/mozilla/gecko-dev.git
Bug 571567 - use <menupopup> instead of <popup>. r=enn
This commit is contained in:
Родитель
7c2aa0ec2e
Коммит
b5aa8e5c8e
|
@ -244,8 +244,8 @@
|
|||
</tree>
|
||||
</panel>
|
||||
|
||||
<popup id="toolbar-context-menu"
|
||||
onpopupshowing="onViewToolbarsPopupShowing(event);">
|
||||
<menupopup id="toolbar-context-menu"
|
||||
onpopupshowing="onViewToolbarsPopupShowing(event);">
|
||||
<menuseparator/>
|
||||
<menuitem command="cmd_ToggleTabsOnTop"
|
||||
type="checkbox"
|
||||
|
@ -255,15 +255,15 @@
|
|||
<menuitem command="cmd_CustomizeToolbars"
|
||||
label="&viewCustomizeToolbar.label;"
|
||||
accesskey="&viewCustomizeToolbar.accesskey;"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
|
||||
<popup id="blockedPopupOptions"
|
||||
onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
|
||||
<menupopup id="blockedPopupOptions"
|
||||
onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
|
||||
<menuitem observes="blockedPopupAllowSite"/>
|
||||
<menuitem observes="blockedPopupEditSettings"/>
|
||||
<menuitem observes="blockedPopupDontShowMessage"/>
|
||||
<menuseparator observes="blockedPopupsSeparator"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
|
||||
<menupopup id="autohide-context"
|
||||
onpopupshowing="FullScreen.getAutohide(this.firstChild);">
|
||||
|
@ -276,13 +276,13 @@
|
|||
oncommand="BrowserFullScreen();"/>
|
||||
</menupopup>
|
||||
|
||||
<popup id="contentAreaContextMenu"
|
||||
onpopupshowing="if (event.target != this) return true; updateEditUIVisibility(); gContextMenu = new nsContextMenu(this, window.getBrowser()); return gContextMenu.shouldDisplay;"
|
||||
onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
|
||||
<menupopup id="contentAreaContextMenu"
|
||||
onpopupshowing="if (event.target != this) return true; updateEditUIVisibility(); gContextMenu = new nsContextMenu(this, window.getBrowser()); return gContextMenu.shouldDisplay;"
|
||||
onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
|
||||
#include browser-context.inc
|
||||
</popup>
|
||||
</menupopup>
|
||||
|
||||
<popup id="placesContext"/>
|
||||
<menupopup id="placesContext"/>
|
||||
|
||||
<panel id="notification-popup" position="after_start" noautofocus="true" hidden="true"/>
|
||||
|
||||
|
|
|
@ -80,15 +80,15 @@
|
|||
|
||||
<popupset id="mainPopupSet">
|
||||
<tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
|
||||
<popup id="contentAreaContextMenu"
|
||||
onpopupshowing="if (event.target != this)
|
||||
return true;
|
||||
gContextMenu = new nsContextMenu(this, getPanelBrowser());
|
||||
return gContextMenu.shouldDisplay;"
|
||||
onpopuphiding="if (event.target == this)
|
||||
gContextMenu = null;">
|
||||
<menupopup id="contentAreaContextMenu"
|
||||
onpopupshowing="if (event.target != this)
|
||||
return true;
|
||||
gContextMenu = new nsContextMenu(this, getPanelBrowser());
|
||||
return gContextMenu.shouldDisplay;"
|
||||
onpopuphiding="if (event.target == this)
|
||||
gContextMenu = null;">
|
||||
#include browser-context.inc
|
||||
</popup>
|
||||
</menupopup>
|
||||
</popupset>
|
||||
|
||||
<commandset id="editMenuCommands"/>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<commandset id="placesCommands"/>
|
||||
<commandset id="editMenuCommands"/>
|
||||
<popup id="placesContext"/>
|
||||
<menupopup id="placesContext"/>
|
||||
|
||||
<!-- Bookmarks and history tooltip -->
|
||||
<tooltip id="bhTooltip"/>
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
</keyset>
|
||||
|
||||
<!-- required to overlay the context menu -->
|
||||
<popup id="placesContext" />
|
||||
<menupopup id="placesContext"/>
|
||||
|
||||
<!-- Bookmarks and history tooltip -->
|
||||
<tooltip id="bhTooltip"/>
|
||||
|
|
|
@ -179,10 +179,10 @@
|
|||
</keyset>
|
||||
|
||||
<popupset id="placesPopupset">
|
||||
<popup id="placesContext"/>
|
||||
<popup id="placesColumnsContext"
|
||||
onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
|
||||
oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
|
||||
<menupopup id="placesContext"/>
|
||||
<menupopup id="placesColumnsContext"
|
||||
onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
|
||||
oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
|
||||
</popupset>
|
||||
|
||||
<toolbox id="placesToolbox">
|
||||
|
|
|
@ -123,10 +123,10 @@
|
|||
oncommand="goDoPlacesCommand('placesCmd_delete');"/>
|
||||
</commandset>
|
||||
|
||||
<popup id="placesContext"
|
||||
onpopupshowing="this._view = PlacesUIUtils.getViewForNode(document.popupNode);
|
||||
return this._view.buildContextMenu(this);"
|
||||
onpopuphiding="this._view.destroyContextMenu();">
|
||||
<menupopup id="placesContext"
|
||||
onpopupshowing="this._view = PlacesUIUtils.getViewForNode(document.popupNode);
|
||||
return this._view.buildContextMenu(this);"
|
||||
onpopuphiding="this._view.destroyContextMenu();">
|
||||
<menuitem id="placesContext_open"
|
||||
command="placesCmd_open"
|
||||
label="&cmd.open.label;"
|
||||
|
@ -258,6 +258,6 @@
|
|||
accesskey="&cmd.properties.accesskey;"
|
||||
selection="bookmark|folder|query"
|
||||
forcehideselection="livemarkChild"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
|
||||
</overlay>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
</keyset>
|
||||
|
||||
<popupset id="ContextMenus">
|
||||
<popup id="ConsoleContext">
|
||||
<menupopup id="ConsoleContext">
|
||||
<menuitem type="radio" id="Console:sortAscend"
|
||||
label="&sortFirst.label;" accesskey="&sortFirst.accesskey;"
|
||||
oncommand="changeSortOrder('forward');"/>
|
||||
|
@ -89,7 +89,7 @@
|
|||
<menuseparator/>
|
||||
<menuitem id="menu_copy_cm" command="cmd_copy"
|
||||
label="©Cmd.label;" accesskey="©Cmd.accesskey;"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
</popupset>
|
||||
|
||||
<toolbox id="console-toolbox">
|
||||
|
|
|
@ -44,8 +44,8 @@
|
|||
|
||||
# Help Window's right-click menu
|
||||
<popupset id="contentAreaContextSet">
|
||||
<popup id="contentAreaContextMenu"
|
||||
onpopupshowing="goUpdateCommand('cmd_copy')">
|
||||
<menupopup id="contentAreaContextMenu"
|
||||
onpopupshowing="goUpdateCommand('cmd_copy')">
|
||||
<menuitem id="context-back"
|
||||
label="&backButton.label;"
|
||||
accesskey="&backButton.accesskey;"
|
||||
|
@ -88,6 +88,6 @@
|
|||
accesskey="&zLevel.accesskey;"
|
||||
oncommand="toggleZLevel(this);"/>
|
||||
#endif
|
||||
</popup>
|
||||
</menupopup>
|
||||
</popupset>
|
||||
</overlay>
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
</commandset>
|
||||
|
||||
<popupset id="contentAreaContextSet">
|
||||
<popup id="contentAreaContextMenu"
|
||||
onpopupshowing="goUpdateCommand('cmd_copy')">
|
||||
<menupopup id="contentAreaContextMenu"
|
||||
onpopupshowing="goUpdateCommand('cmd_copy')">
|
||||
<menuitem id="context-copy"
|
||||
label="©Cmd.label;"
|
||||
accesskey="©Cmd.accesskey;"
|
||||
|
@ -36,7 +36,7 @@
|
|||
label="&selectAllCmd.label;"
|
||||
accesskey="&selectAllCmd.accesskey;"
|
||||
command="cmd_selectAll"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
</popupset>
|
||||
|
||||
<hbox id="filler" style="min-width: 0%;">
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
<stringbundle id="configBundle" src="chrome://global/locale/config.properties"/>
|
||||
|
||||
<popup id="configContext" onpopupshowing="if (event.target == this) updateContextMenu();">
|
||||
<menupopup id="configContext" onpopupshowing="if (event.target == this) updateContextMenu();">
|
||||
<menuitem id="toggleSelected" default="true"
|
||||
label="&toggle.label;" accesskey="&toggle.accesskey;"
|
||||
oncommand="ModifySelected();"/>
|
||||
|
@ -74,7 +74,7 @@
|
|||
</menupopup>
|
||||
</menu>
|
||||
<menuitem id="resetSelected" label="&reset.label;" accesskey="&reset.accesskey;" oncommand="ResetSelected();"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
|
||||
<keyset id="configTreeKeyset" disabled="true">
|
||||
<key keycode="VK_ENTER" oncommand="ModifySelected();"/>
|
||||
|
|
|
@ -111,13 +111,13 @@
|
|||
<key id="key_textZoomReset2" key="&textReset.commandkey2;" command="cmd_textZoomReset" modifiers="accel"/>
|
||||
</keyset>
|
||||
|
||||
<popup id="viewSourceContextMenu">
|
||||
<menupopup id="viewSourceContextMenu">
|
||||
<menuitem id="cMenu_findAgain"/>
|
||||
<menuseparator/>
|
||||
<menuitem id="cMenu_copy"/>
|
||||
<menuseparator/>
|
||||
<menuitem id="cMenu_selectAll"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
|
||||
<!-- Menu -->
|
||||
<toolbox id="viewSource-toolbox">
|
||||
|
|
|
@ -142,7 +142,7 @@
|
|||
|
||||
</keyset>
|
||||
|
||||
<popup id="viewSourceContextMenu">
|
||||
<menupopup id="viewSourceContextMenu">
|
||||
<menuitem id="context-back"
|
||||
label="&backCmd.label;"
|
||||
accesskey="&backCmd.accesskey;"
|
||||
|
@ -159,7 +159,7 @@
|
|||
<menuitem id="cMenu_copy"/>
|
||||
<menuseparator/>
|
||||
<menuitem id="cMenu_selectAll"/>
|
||||
</popup>
|
||||
</menupopup>
|
||||
|
||||
<!-- Menu -->
|
||||
<toolbox id="viewSource-toolbox">
|
||||
|
|
|
@ -26,9 +26,9 @@
|
|||
]]></script>
|
||||
|
||||
<popupset id="aTooltipSet">
|
||||
<popup id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);" >
|
||||
<tooltip id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);">
|
||||
<label id="TOOLTIP-tooltipText" class="tooltip-label" flex="1"/>
|
||||
</popup>
|
||||
</tooltip>
|
||||
</popupset>
|
||||
|
||||
</overlay>
|
||||
|
|
Загрузка…
Ссылка в новой задаче