зеркало из https://github.com/mozilla/gecko-dev.git
Fixing 70746: major xul syntax changes. If you use xul, this WILL affect you! Read n.p.m.xpfe for details on the changes and how you can fix your code. r=hewitt sr=hyatt, ben
This commit is contained in:
Родитель
066e77a947
Коммит
f17b66929d
|
@ -46,122 +46,122 @@
|
|||
ondestroy="contextMenu.onDestroy(); contextMenu = null;">
|
||||
<!-- Open ==================================== -->
|
||||
<menuitem id="context-openlink"
|
||||
value="&openLinkCmd.label;"
|
||||
label="&openLinkCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="contextMenu.openLink();"/>
|
||||
<!-- XXX - DEPENDENT ON PRESENCE OF EDITOR!! - XXX -->
|
||||
<menuitem id="context-editlink"
|
||||
value="&editLinkCmd.label;"
|
||||
label="&editLinkCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="contextMenu.editLink();"/>
|
||||
<menuitem id="context-openframe"
|
||||
value="&openFrameCmd.label;"
|
||||
label="&openFrameCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="contextMenu.openFrame();"/>
|
||||
<menuitem id="context-showonlythisframe"
|
||||
value="&showOnlyThisFrameCmd.label;"
|
||||
label="&showOnlyThisFrameCmd.label;"
|
||||
accesskey="&showOnlyThisFrameCmd.accesskey;"
|
||||
oncommand="contextMenu.showOnlyThisFrame();"/>
|
||||
<menuseparator id="context-sep-open"/>
|
||||
<!-- Navigation ============================== -->
|
||||
<menuitem id="context-back"
|
||||
value="&goBackCmd.label;"
|
||||
label="&goBackCmd.label;"
|
||||
accesskey="&goBackCmd.accesskey;"
|
||||
oncommand="BrowserBack()"/>
|
||||
<menuitem id="context-forward"
|
||||
value="&goForwardCmd.label;"
|
||||
label="&goForwardCmd.label;"
|
||||
accesskey="&goForwardCmd.accesskey;"
|
||||
oncommand="BrowserForward()"/>
|
||||
<menuitem id="context-reload"
|
||||
value="&reloadCmd.label;"
|
||||
label="&reloadCmd.label;"
|
||||
accesskey="&reloadCmd.accesskey;"
|
||||
oncommand="BrowserReload();"/>
|
||||
<menuitem id="context-reload-frame"
|
||||
value="&reloadFrameCmd.label;"
|
||||
label="&reloadFrameCmd.label;"
|
||||
accesskey="&reloadFrameCmd.accesskey;"
|
||||
oncommand="contextMenu.reloadFrame();"/>
|
||||
<menuitem id="context-stop"
|
||||
value="&stopCmd.label;"
|
||||
label="&stopCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="BrowserStop();"/>
|
||||
<menuseparator id="context-sep-navigation"/>
|
||||
<!-- View ==================================== -->
|
||||
<menuitem id="context-viewsource"
|
||||
value="&viewPageSourceCmd.label;"
|
||||
label="&viewPageSourceCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="BrowserViewSource();"/>
|
||||
<menuitem id="context-viewframesource"
|
||||
value="&viewFrameSourceCmd.label;"
|
||||
label="&viewFrameSourceCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="contextMenu.viewFrameSource();"/>
|
||||
<menuitem id="context-viewinfo"
|
||||
value="&viewPageInfoCmd.label;"
|
||||
label="&viewPageInfoCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="contextMenu.viewInfo();"/>
|
||||
<menuitem id="context-viewframeinfo"
|
||||
value="&viewFrameInfoCmd.label;"
|
||||
label="&viewFrameInfoCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="contextMenu.viewFrameInfo();"/>
|
||||
<menuitem id="context-viewimage"
|
||||
value="&viewImageCmd.label;"
|
||||
label="&viewImageCmd.label;"
|
||||
accesskey=""
|
||||
oncommand="contextMenu.viewImage();"/>
|
||||
<menuseparator id="context-sep-view"/>
|
||||
<!-- Misc ==================================== -->
|
||||
<menuitem id="context-bookmarkpage"
|
||||
value="&bookmarkPageCmd.label;"
|
||||
label="&bookmarkPageCmd.label;"
|
||||
accesskey="&bookmarkPageCmd.accesskey;"
|
||||
oncommand="BookmarksUtils.addBookmarkForBrowser(document.getElementById('content').webNavigation);"/>
|
||||
<menuitem id="context-bookmarklink"
|
||||
value="&bookmarkLinkCmd.label;"
|
||||
label="&bookmarkLinkCmd.label;"
|
||||
accesskey="&bookmarkLinkCmd.accesskey;"
|
||||
oncommand="BookmarksUtils.addBookmark(contextMenu.linkURL(),
|
||||
contextMenu.linkText());"/>
|
||||
<menuseparator id="context-sep-bookmark"/>
|
||||
<!-- Save ==================================== -->
|
||||
<menuitem id="context-savepage"
|
||||
value="&savePageCmd.label;"
|
||||
label="&savePageCmd.label;"
|
||||
accesskey="&savePageCmd.accesskey;"
|
||||
oncommand="contextMenu.savePage();"/>
|
||||
<menuitem id="context-saveframe"
|
||||
value="&saveFrameCmd.label;"
|
||||
label="&saveFrameCmd.label;"
|
||||
accesskey="&saveFrameCmd.accesskey;"
|
||||
oncommand="contextMenu.saveFrame();"/>
|
||||
<menuitem id="context-savelink"
|
||||
value="&saveLinkCmd.label;"
|
||||
label="&saveLinkCmd.label;"
|
||||
accesskey="&saveLinkCmd.accesskey;"
|
||||
oncommand="contextMenu.saveLink();"/>
|
||||
<menuitem id="context-saveimage"
|
||||
accesskey="&saveImageCmd.accesskey;"
|
||||
oncommand="contextMenu.saveImage();"/>
|
||||
<menuitem id="context-savebgimage"
|
||||
value="&saveBGImageCmd.label;"
|
||||
label="&saveBGImageCmd.label;"
|
||||
accesskey="&saveBGImageCmd.accesskey;"
|
||||
oncommand="contextMenu.saveBGImage();"/>
|
||||
<menuseparator id="context-sep-save"/>
|
||||
<!-- Clipboard =============================== -->
|
||||
<menuitem id="context-selectall"
|
||||
value="&selectAllCmd.label;"
|
||||
label="&selectAllCmd.label;"
|
||||
accesskey="&selectAllCmd.accesskey;"
|
||||
observes="cmd_selectAll"/>
|
||||
<menuitem id="context-cut"
|
||||
value="&cutCmd.label;"
|
||||
label="&cutCmd.label;"
|
||||
accesskey="&cutCmd.accesskey;"
|
||||
observes="cmd_cut"/>
|
||||
<menuitem id="context-copy"
|
||||
value="©Cmd.label;"
|
||||
label="©Cmd.label;"
|
||||
accesskey="©Cmd.accesskey;"
|
||||
observes="cmd_copy"/>
|
||||
<menuitem id="context-paste"
|
||||
value="&pasteCmd.label;"
|
||||
label="&pasteCmd.label;"
|
||||
accesskey="&pasteCmd.accesskey;"
|
||||
observes="cmd_paste"/>
|
||||
<menuitem id="context-copylink"
|
||||
value="©LinkCmd.label;"
|
||||
label="©LinkCmd.label;"
|
||||
accesskey="©LinkCmd.accesskey;"
|
||||
oncommand="contextMenu.copyLink();"/>
|
||||
<menuitem id="context-copyimage"
|
||||
value="©ImageCmd.label;"
|
||||
label="©ImageCmd.label;"
|
||||
accesskey="©ImageCmd.accesskey;"
|
||||
oncommand="contextMenu.copyImage();"/>
|
||||
</popup>
|
||||
|
|
|
@ -120,7 +120,7 @@ nsContextMenu.prototype = {
|
|||
var bundle = srGetStrBundle("chrome://communicator/locale/contentAreaCommands.properties");
|
||||
var caption = bundle.formatStringFromName("saveImageAs",[imageName],1);
|
||||
|
||||
saveImageMenuItem.setAttribute( "value", caption );
|
||||
saveImageMenuItem.setAttribute( "label", caption );
|
||||
}
|
||||
|
||||
// Remove separator if none of these were shown.
|
||||
|
|
|
@ -56,15 +56,15 @@ function onLoad()
|
|||
}
|
||||
|
||||
// change OK button text to 'open'
|
||||
dialog.open.setAttribute("value", bundle.GetStringFromName("openButtonLabel"));
|
||||
dialog.open.label = bundle.GetStringFromName("openButtonLabel");
|
||||
|
||||
doSetOKCancel(open, 0, 0, 0);
|
||||
|
||||
dialog.input.focus();
|
||||
if (pref) {
|
||||
try {
|
||||
var data = pref.GetIntPref("general.open_location.last_window_choice");
|
||||
var element = dialog.openAppList.getElementsByAttribute("data", data)[0];
|
||||
var value = pref.GetIntPref("general.open_location.last_window_choice");
|
||||
var element = dialog.openAppList.getElementsByAttribute("value", value)[0];
|
||||
if (element)
|
||||
dialog.openAppList.selectedItem = element;
|
||||
dialog.input.value = pref.CopyUnicharPref("general.open_location.last_url");
|
||||
|
@ -87,7 +87,7 @@ function open()
|
|||
{
|
||||
var url = browser.getShortcutOrURI(dialog.input.value);
|
||||
try {
|
||||
switch (dialog.openAppList.data) {
|
||||
switch (dialog.openAppList.value) {
|
||||
case "0":
|
||||
browser.loadURI(url);
|
||||
break;
|
||||
|
@ -106,7 +106,7 @@ function open()
|
|||
|
||||
if (pref) {
|
||||
pref.SetUnicharPref("general.open_location.last_url", dialog.input.value);
|
||||
pref.SetIntPref("general.open_location.last_window_choice", dialog.openAppList.data);
|
||||
pref.SetIntPref("general.open_location.last_window_choice", dialog.openAppList.value);
|
||||
}
|
||||
|
||||
// Delay closing slightly to avoid timing bug on Linux.
|
||||
|
@ -127,7 +127,7 @@ function onChooseFile()
|
|||
var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
|
||||
fp.init(window, bundle.GetStringFromName("chooseFileDialogTitle"), nsIFilePicker.modeOpen);
|
||||
|
||||
if (dialog.openAppList.data == "2") {
|
||||
if (dialog.openAppList.value == "2") {
|
||||
// When loading into Composer, direct user to prefer HTML files and text files,
|
||||
// so we call separately to control the order of the filter list
|
||||
fp.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterText);
|
||||
|
|
|
@ -65,16 +65,16 @@
|
|||
|
||||
<box autostretch="never">
|
||||
<textbox id="dialog.input" flex="1" oninput="doEnabling();"/>
|
||||
<button value="&chooseFile.label;" onclick="onChooseFile();"/>
|
||||
<button label="&chooseFile.label;" onclick="onChooseFile();"/>
|
||||
</box>
|
||||
<box autostretch="never" valign="center">
|
||||
<text class="label" value="&openWhere.label;"/>
|
||||
<menulist id="openAppList">
|
||||
<menupopup>
|
||||
<menuitem data="0" id="currentWindow" value="&topWindow.label;"/>
|
||||
<menuitem data="1" value="&newWindow.label;"/>
|
||||
<menuitem value="0" id="currentWindow" label="&topWindow.label;"/>
|
||||
<menuitem value="1" label="&newWindow.label;"/>
|
||||
<menuseparator/>
|
||||
<menuitem data="2" id="editWindow" value="&editNewWindow.label;"/>
|
||||
<menuitem value="2" id="editWindow" label="&editNewWindow.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
<spring flex="1"/>
|
||||
|
|
|
@ -28,18 +28,18 @@
|
|||
</keyset>
|
||||
|
||||
<broadcasterset id="broadcasterset">
|
||||
<broadcaster id="Tasks:Navigator" value="&navigatorCmd.label;" oncommand="toNavigator();"/>
|
||||
<broadcaster id="Tasks:Editor" value="&editorCmd.label;" oncommand="toEditor();"/>
|
||||
<broadcaster id="Tasks:AddressBook" value="&addressBookCmd.label;" oncommand="toAddressBook();"/>
|
||||
<broadcaster id="Tasks:Navigator" label="&navigatorCmd.label;" oncommand="toNavigator();"/>
|
||||
<broadcaster id="Tasks:Editor" label="&editorCmd.label;" oncommand="toEditor();"/>
|
||||
<broadcaster id="Tasks:AddressBook" label="&addressBookCmd.label;" oncommand="toAddressBook();"/>
|
||||
</broadcasterset>
|
||||
|
||||
|
||||
<!-- Tasks Menu -->
|
||||
<menu id="tasksMenu" value="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;" datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot">
|
||||
<menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;" datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot">
|
||||
<template>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="ShowWindowFromResource(event.target)"/>
|
||||
<menuitem uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="ShowWindowFromResource(event.target)"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
|
@ -53,19 +53,19 @@
|
|||
|
||||
<menuseparator/>
|
||||
|
||||
<menu value="&privacyMenu.label;" accesskey="&privacyMenu.accesskey;">
|
||||
<menu label="&privacyMenu.label;" accesskey="&privacyMenu.accesskey;">
|
||||
<menupopup id="personalManagers">
|
||||
<menuitem id="lastInPersonalManagers" style="display:none;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuseparator/>
|
||||
|
||||
<menu value="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
|
||||
<menu label="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
|
||||
<menupopup id="toolsPopup" oncreate="javaItemEnabling();">
|
||||
<menuitem value="&historyCmd.label;" accesskey="&historyCmd.accesskey;" oncommand="toHistory()" key="key_gotoHistory"/>
|
||||
<menuitem value="&importUtilCmd.label;" accesskey="&importUtilCmd.accesskey;" oncommand="toImport()"/>
|
||||
<menuitem id="java" value="&javaConsoleCmd.label;" accesskey="&javaConsoleCmd.accesskey;" oncommand="toJavaConsole()"/>
|
||||
<menuitem value="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
|
||||
<menuitem label="&historyCmd.label;" accesskey="&historyCmd.accesskey;" oncommand="toHistory()" key="key_gotoHistory"/>
|
||||
<menuitem label="&importUtilCmd.label;" accesskey="&importUtilCmd.accesskey;" oncommand="toImport()"/>
|
||||
<menuitem id="java" label="&javaConsoleCmd.label;" accesskey="&javaConsoleCmd.accesskey;" oncommand="toJavaConsole()"/>
|
||||
<menuitem label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuseparator/>
|
||||
|
|
|
@ -42,14 +42,14 @@ function setOfflineStatus(aToggleFlag)
|
|||
{
|
||||
broadcaster.setAttribute("offline", "true");
|
||||
broadcaster.setAttribute("tooltiptext", bundle.GetStringFromName("offlineTooltip"));
|
||||
broadcaster.setAttribute("value", bundle.GetStringFromName("goonline"));
|
||||
broadcaster.setAttribute("label", bundle.GetStringFromName("goonline"));
|
||||
FillInTooltip(broadcaster);
|
||||
}
|
||||
else if (broadcaster)
|
||||
{
|
||||
broadcaster.removeAttribute("offline");
|
||||
broadcaster.setAttribute("tooltiptext", bundle.GetStringFromName("onlineTooltip"));
|
||||
broadcaster.setAttribute("value", bundle.GetStringFromName("gooffline"));
|
||||
broadcaster.setAttribute("label", bundle.GetStringFromName("gooffline"));
|
||||
FillInTooltip(broadcaster);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<!-- online/offline status indicators -->
|
||||
<broadcasterset id="broadcasterset">
|
||||
<broadcaster id="Communicator:WorkMode" value="&offlineGoOfflineCmd.label;" oncommand="setOfflineStatus(true);"/>
|
||||
<broadcaster id="Communicator:WorkMode" label="&offlineGoOfflineCmd.label;" oncommand="setOfflineStatus(true);"/>
|
||||
</broadcasterset>
|
||||
<statusbarpanel id="offline-status" tooltip="aTooltip" observes="Communicator:WorkMode"/>
|
||||
<menuitem id="offlineGoOfflineCmd" accesskey="&offlineGoOfflineCmd.accesskey;" observes="Communicator:WorkMode"/>
|
||||
|
@ -34,27 +34,27 @@
|
|||
<!-- NOT IMPLEMENTED, so temporarily disabled -->
|
||||
<broadcaster id="cmd_newEditorTemplate" disabled="true" oncommand="NewEditorFromTemplate();"/>
|
||||
<broadcaster id="cmd_newEditorDraft" disabled="true" oncommand="NewEditorFromDraft();"/>
|
||||
<broadcaster id="cmd_pageSetup" value="&pageSetupCmd.label;" disabled="true" oncommand="goPageSetup();"/>
|
||||
<broadcaster id="cmd_pageSetup" label="&pageSetupCmd.label;" disabled="true" oncommand="goPageSetup();"/>
|
||||
|
||||
<menuitem id="menu_newEditor" value="&newBlankPageCmd.label;" accesskey="&newBlankPageCmd.accesskey;" key="key_newBlankPage" observes="cmd_newEditor"/>
|
||||
<menuitem id="menu_newEditorTemplate" value="&newPageFromTemplateCmd.label;" accesskey="&newPageFromTemplateCmd.accesskey;" observes="cmd_newEditorTemplate"/>
|
||||
<menuitem id="menu_newEditorDraft" value="&newPageFromDraftCmd.label;" accesskey="&newPageFromDraftCmd.accesskey;" observes="cmd_newEditorDraft"/>
|
||||
<menuitem id="menu_newEditor" label="&newBlankPageCmd.label;" accesskey="&newBlankPageCmd.accesskey;" key="key_newBlankPage" observes="cmd_newEditor"/>
|
||||
<menuitem id="menu_newEditorTemplate" label="&newPageFromTemplateCmd.label;" accesskey="&newPageFromTemplateCmd.accesskey;" observes="cmd_newEditorTemplate"/>
|
||||
<menuitem id="menu_newEditorDraft" label="&newPageFromDraftCmd.label;" accesskey="&newPageFromDraftCmd.accesskey;" observes="cmd_newEditorDraft"/>
|
||||
|
||||
<menu id="menu_New" value="&newMenu.label;" accesskey="&newMenu.accesskey;"/>
|
||||
<menuitem id="menu_newNavigator" value="&newNavigatorCmd.label;" accesskey="&newNavigatorCmd.accesskey;" key="key_newNavigator" observes="cmd_newNavigator"/>
|
||||
<menu id="menu_New" label="&newMenu.label;" accesskey="&newMenu.accesskey;"/>
|
||||
<menuitem id="menu_newNavigator" label="&newNavigatorCmd.label;" accesskey="&newNavigatorCmd.accesskey;" key="key_newNavigator" observes="cmd_newNavigator"/>
|
||||
|
||||
<key id="key_newBlankPage" key="&newBlankPageCmd.key;" observes="cmd_newEditor" modifiers="accel, shift"/>
|
||||
<key id="key_newNavigator" key="&newNavigatorCmd.key;" observes="cmd_newNavigator" modifiers="accel"/>
|
||||
|
||||
<!-- Edit Menu -->
|
||||
<menu id="menu_Edit" value="&editMenu.label;" accesskey="&editMenu.accesskey;"/>
|
||||
<menuitem id="menu_undo" value="&undoCmd.label;" key="key_undo" accesskey="&undoCmd.accesskey;" observes="cmd_undo"/>
|
||||
<menuitem id="menu_redo" value="&redoCmd.label;" key="key_redo" accesskey="&redoCmd.accesskey;" observes="cmd_redo"/>
|
||||
<menuitem id="menu_cut" value="&cutCmd.label;" key="key_cut" accesskey="&cutCmd.accesskey;" observes="cmd_cut"/>
|
||||
<menuitem id="menu_copy" value="©Cmd.label;" key="key_copy" accesskey="©Cmd.accesskey;" observes="cmd_copy"/>
|
||||
<menuitem id="menu_paste" value="&pasteCmd.label;" key="key_paste" accesskey="&pasteCmd.accesskey;" observes="cmd_paste"/>
|
||||
<menuitem id="menu_delete" value="&deleteCmd.label;" key="key_delete" accesskey="&deleteCmd.accesskey;" observes="cmd_delete"/>
|
||||
<menuitem id="menu_selectAll" value="&selectAllCmd.label;" key="key_selectAll" accesskey="&selectAllCmd.accesskey;" observes="cmd_selectAll"/>
|
||||
<menuitem id="menu_undo" label="&undoCmd.label;" key="key_undo" accesskey="&undoCmd.accesskey;" observes="cmd_undo"/>
|
||||
<menuitem id="menu_redo" label="&redoCmd.label;" key="key_redo" accesskey="&redoCmd.accesskey;" observes="cmd_redo"/>
|
||||
<menuitem id="menu_cut" label="&cutCmd.label;" key="key_cut" accesskey="&cutCmd.accesskey;" observes="cmd_cut"/>
|
||||
<menuitem id="menu_copy" label="©Cmd.label;" key="key_copy" accesskey="©Cmd.accesskey;" observes="cmd_copy"/>
|
||||
<menuitem id="menu_paste" label="&pasteCmd.label;" key="key_paste" accesskey="&pasteCmd.accesskey;" observes="cmd_paste"/>
|
||||
<menuitem id="menu_delete" label="&deleteCmd.label;" key="key_delete" accesskey="&deleteCmd.accesskey;" observes="cmd_delete"/>
|
||||
<menuitem id="menu_selectAll" label="&selectAllCmd.label;" key="key_selectAll" accesskey="&selectAllCmd.accesskey;" observes="cmd_selectAll"/>
|
||||
|
||||
<!-- These key nodes are here only for show. -->
|
||||
<!-- The real bindings come from XBL, in platformHTMLBindings.xml. -->
|
||||
|
@ -112,7 +112,7 @@
|
|||
<!-- Not needed yet, window just needs a broadcaster with this id and oncommand= broadcaster id="cmd_preferences"/-->
|
||||
|
||||
<menuitem id="menu_preferences"
|
||||
value="&preferencesCmd.label;"
|
||||
label="&preferencesCmd.label;"
|
||||
key="key_preferences"
|
||||
accesskey="&preferencesCmd.accesskey;"
|
||||
observes="cmd_preferences"/>
|
||||
|
@ -121,23 +121,23 @@
|
|||
|
||||
|
||||
<!-- View Menu -->
|
||||
<menu id="menu_View" value="&viewMenu.label;" accesskey="&viewMenu.accesskey;"/>
|
||||
<menu id="menu_Toolbars" value="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;"/>
|
||||
<menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;"/>
|
||||
<menu id="menu_Toolbars" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;"/>
|
||||
<menuitem id="menu_showTaskbar"
|
||||
value="&showTaskbarCmd.label;"
|
||||
label="&showTaskbarCmd.label;"
|
||||
accesskey="&showTaskbarCmd.accesskey;"
|
||||
oncommand="goToggleToolbar('taskbar', 'menu_showTaskbar')"
|
||||
checked="true"/>
|
||||
|
||||
<!-- Help Menu -->
|
||||
<menu id="menu_Help" value="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
|
||||
<menu id="menu_Help" label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
|
||||
<menupopup id="helpPopup">
|
||||
<menuitem accesskey="&releaseCmd.accesskey;" value="&releaseCmd.label;"
|
||||
<menuitem accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;"
|
||||
id="releaseUrl" oncommand="openTopWin('&releaseURL;');"/>
|
||||
<menuseparator/>
|
||||
<menuitem class="about" accesskey="&aboutCommPluginsCmd.accesskey;" value="&aboutCommPluginsCmd.label;"
|
||||
<menuitem class="about" accesskey="&aboutCommPluginsCmd.accesskey;" label="&aboutCommPluginsCmd.label;"
|
||||
id="pluginInfo" oncommand="openTopWin('about:plugins')"/>
|
||||
<menuitem accesskey="&aboutCmd.accesskey;" value="&aboutCmd.label;"
|
||||
<menuitem accesskey="&aboutCmd.accesskey;" label="&aboutCmd.label;"
|
||||
id="aboutName" oncommand="goAboutDialog();"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
|
|
|
@ -246,10 +246,10 @@ function registerZoomManager()
|
|||
else
|
||||
label = zoom.bundle.getString("label");
|
||||
|
||||
menuItem.setAttribute("value", label.replace(/%zoom%/, zoomFactors[i]));
|
||||
menuItem.setAttribute("label", label.replace(/%zoom%/, zoomFactors[i]));
|
||||
menuItem.setAttribute("accesskey", accessKeys[i]);
|
||||
menuItem.setAttribute("oncommand", "ZoomManager.prototype.getInstance().textZoom = this.data;");
|
||||
menuItem.setAttribute("data", zoomFactors[i]);
|
||||
menuItem.setAttribute("oncommand", "ZoomManager.prototype.getInstance().textZoom = this.value;");
|
||||
menuItem.setAttribute("value", zoomFactors[i]);
|
||||
popup.insertBefore(menuItem, insertBefore);
|
||||
}
|
||||
}
|
||||
|
@ -261,7 +261,7 @@ function updateViewMenu()
|
|||
|
||||
var textZoomMenu = document.getElementById("menu_textZoom");
|
||||
var menuLabel = zoom.bundle.getString("menuLabel").replace(/%zoom%/, zoom.textZoom);
|
||||
textZoomMenu.setAttribute("value", menuLabel);
|
||||
textZoomMenu.setAttribute("label", menuLabel);
|
||||
}
|
||||
|
||||
function updateTextZoomMenu()
|
||||
|
@ -272,14 +272,14 @@ function updateTextZoomMenu()
|
|||
|
||||
var textZoomOther = document.getElementById("menu_textZoomOther");
|
||||
var label = zoom.bundle.getString("labelOther");
|
||||
textZoomOther.setAttribute("value", label.replace(/%zoom%/, zoom.factorOther));
|
||||
textZoomOther.setAttribute("data", zoom.factorOther);
|
||||
textZoomOther.setAttribute("label", label.replace(/%zoom%/, zoom.factorOther));
|
||||
textZoomOther.setAttribute("value", zoom.factorOther);
|
||||
|
||||
var popup = document.getElementById("menu_textZoomPopup");
|
||||
var item = popup.firstChild;
|
||||
while (item) {
|
||||
if (item.getAttribute("name") == "textZoom") {
|
||||
if (item.getAttribute("data") == currentZoom)
|
||||
if (item.getAttribute("value") == currentZoom)
|
||||
item.setAttribute("checked","true");
|
||||
else
|
||||
item.removeAttribute("checked");
|
||||
|
|
|
@ -63,8 +63,8 @@
|
|||
|
||||
<menu id="menu_textZoom" accesskey="&textZoomMenu.accesskey;" hidden="true">
|
||||
<menupopup id="menu_textZoomPopup" oncreate="updateTextZoomMenu();">
|
||||
<menuitem key="key_textZoomReduce" value="&textZoomReduceCmd.label;" accesskey="&textZoomReduceCmd.accesskey;" observes="cmd_textZoomReduce"/>
|
||||
<menuitem key="key_textZoomEnlarge" value="&textZoomEnlargeCmd.label;" accesskey="&textZoomEnlargeCmd.accesskey;" observes="cmd_textZoomEnlarge"/>
|
||||
<menuitem key="key_textZoomReduce" label="&textZoomReduceCmd.label;" accesskey="&textZoomReduceCmd.accesskey;" observes="cmd_textZoomReduce"/>
|
||||
<menuitem key="key_textZoomEnlarge" label="&textZoomEnlargeCmd.label;" accesskey="&textZoomEnlargeCmd.accesskey;" observes="cmd_textZoomEnlarge"/>
|
||||
<menuseparator/>
|
||||
<menuseparator id="menu_textZoomInsertBefore"/>
|
||||
<menuitem id="menu_textZoomOther" type="radio" name="textZoom" accesskey="&textZoomOtherCmd.accesskey;" oncommand="setTextZoomOther();"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче