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 951364 - [Australis] button context menu should offer to "move", not "add". r=jaws

Browse Source
This commit is contained in:
Justin Dolske 2013-12-17 13:21:37 -08:00
parent 19c320d2e5
commit 76814b4c2f
5 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4257,10 +4257,10 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
}
let addToPanel = popup.querySelector(".customize-context-addToPanel");
let moveToPanel = popup.querySelector(".customize-context-moveToPanel");
let removeFromToolbar = popup.querySelector(".customize-context-removeFromToolbar");
// View -> Toolbars menu doesn't have the addToPanel or removeFromToolbar items.
if (!addToPanel || !removeFromToolbar) {
// View -> Toolbars menu doesn't have the moveToPanel or removeFromToolbar items.
if (!moveToPanel || !removeFromToolbar) {
return;
}
@ -4287,10 +4287,10 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
let movable = toolbarItem && toolbarItem.parentNode &&
CustomizableUI.isWidgetRemovable(toolbarItem);
if (movable) {
addToPanel.removeAttribute("disabled");
moveToPanel.removeAttribute("disabled");
removeFromToolbar.removeAttribute("disabled");
} else {
addToPanel.setAttribute("disabled", true);
moveToPanel.setAttribute("disabled", true);
removeFromToolbar.setAttribute("disabled", true);
}
}

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

@ -246,8 +246,8 @@
onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
<menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
accesskey="&customizeMenu.addToPanel.accesskey;"
label="&customizeMenu.addToPanel.label;"
class="customize-context-addToPanel"/>
label="&customizeMenu.moveToPanel.label;"
class="customize-context-moveToPanel"/>
<menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
accesskey="&customizeMenu.removeFromToolbar.accesskey;"
label="&customizeMenu.removeFromToolbar.label;"

6
browser/components/customizableui/content/panelUI.inc.xul
View File

@ -126,9 +126,9 @@
see bug 492960 comment 20. -->
<menupopup id="customizationPanelItemContextMenu">
<menuitem oncommand="gCustomizeMode.addToToolbar(document.popupNode)"
class="customize-context-addToToolbar"
accesskey="&customizeMenu.addToToolbar.accesskey;"
label="&customizeMenu.addToToolbar.label;"/>
class="customize-context-moveToToolbar"
accesskey="&customizeMenu.moveToToolbar.accesskey;"
label="&customizeMenu.moveToToolbar.label;"/>
<menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
class="customize-context-removeFromPanel"
accesskey="&customizeMenu.removeFromMenu.accesskey;"

14
browser/components/customizableui/test/browser_880164_customization_context_menus.js
View File

@ -18,7 +18,7 @@ add_task(function() {
yield shownPromise;
let expectedEntries = [
[".customize-context-addToPanel", true],
[".customize-context-moveToPanel", true],
[".customize-context-removeFromToolbar", true],
["---"]
];
@ -49,7 +49,7 @@ add_task(function() {
yield shownPromise;
let expectedEntries = [
[".customize-context-addToPanel", false],
[".customize-context-moveToPanel", false],
[".customize-context-removeFromToolbar", false],
["---"]
];
@ -111,7 +111,7 @@ add_task(function() {
is(PanelUI.panel.state, "open", "The PanelUI should still be open.");
let expectedEntries = [
[".customize-context-addToToolbar", true],
[".customize-context-moveToToolbar", true],
[".customize-context-removeFromPanel", true],
["---"],
[".viewCustomizeToolbar", true]
@ -138,7 +138,7 @@ add_task(function() {
yield shownPromise;
let expectedEntries = [
[".customize-context-addToPanel", true],
[".customize-context-moveToPanel", true],
[".customize-context-removeFromToolbar", true],
["---"]
];
@ -187,7 +187,7 @@ add_task(function() {
yield shownPromise;
let expectedEntries = [
[".customize-context-addToToolbar", true],
[".customize-context-moveToToolbar", true],
[".customize-context-removeFromPanel", true],
["---"],
[".viewCustomizeToolbar", false]
@ -214,7 +214,7 @@ add_task(function() {
yield shownPromise;
let expectedEntries = [
[".customize-context-addToToolbar", true],
[".customize-context-moveToToolbar", true],
[".customize-context-removeFromPanel", true],
["---"],
[".viewCustomizeToolbar", false]
@ -254,7 +254,7 @@ add_task(function() {
yield shownPromise;
let expectedEntries = [
[".customize-context-addToPanel", true],
[".customize-context-moveToPanel", true],
[".customize-context-removeFromToolbar", true],
["---"]
];

4
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -333,6 +333,10 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY customizeMenu.addToToolbar.accesskey "A">
<!ENTITY customizeMenu.addToPanel.label "Add to Menu">
<!ENTITY customizeMenu.addToPanel.accesskey "M">
<!ENTITY customizeMenu.moveToToolbar.label "Move to Toolbar">
<!ENTITY customizeMenu.moveToToolbar.accesskey "M">
<!ENTITY customizeMenu.moveToPanel.label "Move to Menu">
<!ENTITY customizeMenu.moveToPanel.accesskey "M">
<!ENTITY customizeMenu.removeFromToolbar.label "Remove from Toolbar">
<!ENTITY customizeMenu.removeFromToolbar.accesskey "R">
<!ENTITY customizeMenu.removeFromMenu.label "Remove from Menu">