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 946395 - [Australis] Back out bug 881937 (panel menu keyboard access). r=Gijs ui-r=phlsa

Browse Source
This commit is contained in:
Dão Gottwald 2014-01-24 15:44:08 +01:00
parent 912fabd939
commit cf2932530f
7 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/browser-feeds.js
View File

@ -56,7 +56,6 @@ var FeedHandler = {
item.setAttribute("crop", "center");
let className = "feed-" + itemNodeType;
if (isSubview) {
item.setAttribute("tabindex", "0");
className += " subviewbutton";
}
item.setAttribute("class", className);

8
browser/base/content/browser-sets.inc
View File

@ -114,7 +114,6 @@
<command id="Social:FocusChat" oncommand="SocialChatBar.focus();" hidden="true" disabled="true"/>
<command id="Social:Toggle" oncommand="Social.toggle();" hidden="true"/>
<command id="Social:Addons" oncommand="BrowserOpenAddonsMgr('addons://list/service');"/>
<command id="MenuPanel:Toggle" oncommand="PanelUI.toggle(event);"/>
</commandset>
<commandset id="placesCommands">
@ -406,13 +405,6 @@
#endif
<key id="key_undoCloseWindow" command="History:UndoCloseWindow" key="&newNavigatorCmd.key;" modifiers="accel,shift"/>
<key id="key_menuButton" command="MenuPanel:Toggle"
#ifdef XP_MACOSX
key="&toggleMenuPanelMac.key;" modifiers="accel,shift"/>
#else
key="&toggleMenuPanel.key;" modifiers="accel"/>
#endif
#ifdef XP_GNOME
#define NUM_SELECT_TAB_MODIFIER alt
#else

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

@ -18,14 +18,14 @@
<!-- The parentNode is used so that the footer is presented as the anchor
instead of just the button being the anchor. -->
<toolbarbutton id="PanelUI-customize" label="&appMenuCustomize.label;"
exitLabel="&appMenuCustomizeExit.label;" tabindex="0"
exitLabel="&appMenuCustomizeExit.label;"
oncommand="gCustomizeMode.toggle();"/>
<toolbarseparator/>
<toolbarbutton id="PanelUI-help" label="&helpMenu.label;" tabindex="0"
<toolbarbutton id="PanelUI-help" label="&helpMenu.label;"
tooltiptext="&helpMenu.label;"
oncommand="PanelUI.showHelpView(this.parentNode);"/>
<toolbarseparator/>
<toolbarbutton id="PanelUI-quit" tabindex="0"
<toolbarbutton id="PanelUI-quit"
#ifdef XP_WIN
label="&quitApplicationCmdWin.label;"
tooltiptext="&quitApplicationCmdWin.label;"
@ -39,14 +39,14 @@
<panelview id="PanelUI-history" flex="1">
<label value="&appMenuHistory.label;" class="panel-subview-header"/>
<toolbarbutton id="appMenuViewHistorySidebar" tabindex="0"
<toolbarbutton id="appMenuViewHistorySidebar"
label="&appMenuHistory.viewSidebar.label;"
type="checkbox"
class="subviewbutton"
oncommand="toggleSidebar('viewHistorySidebar'); PanelUI.hide();">
<observes element="viewHistorySidebar" attribute="checked"/>
</toolbarbutton>
<toolbarbutton id="appMenuClearRecentHistory" tabindex="0"
<toolbarbutton id="appMenuClearRecentHistory"
label="&appMenuHistory.clearRecent.label;"
class="subviewbutton"
command="Tools:Sanitize"/>
@ -57,7 +57,7 @@
oncommand="BrowserOpenSyncTabs();"
disabled="true"/>
#endif
<toolbarbutton id="appMenuRestoreLastSession" tabindex="0"
<toolbarbutton id="appMenuRestoreLastSession"
label="&appMenuHistory.restoreSession.label;"
class="subviewbutton"
command="Browser:RestoreLastSession"/>
@ -67,7 +67,7 @@
<vbox id="PanelUI-recentlyClosedWindows" tooltip="bhTooltip"/>
<menuseparator id="PanelUI-historyItems-separator"/>
<vbox id="PanelUI-historyItems" tooltip="bhTooltip"/>
<toolbarbutton id="PanelUI-historyMore" tabindex="0"
<toolbarbutton id="PanelUI-historyMore"
class="panel-subview-footer subviewbutton"
label="&appMenuHistory.showAll.label;"
oncommand="PlacesCommandHook.showPlacesOrganizer('History'); CustomizableUI.hidePanelForNode(this);"/>

6
browser/components/customizableui/content/panelUI.js
View File

@ -141,12 +141,6 @@ const PanelUI = {
let iconAnchor =
document.getAnonymousElementByAttribute(anchor, "class",
"toolbarbutton-icon");
// Only focus the panel if it's opened using the keyboard, so that
// cut/copy/paste buttons will work for mouse users.
let keyboardOpened = aEvent && aEvent.sourceEvent &&
aEvent.sourceEvent.target.localName == "key";
this.panel.setAttribute("noautofocus", !keyboardOpened);
this.panel.openPopup(iconAnchor || anchor, "bottomcenter topright");
this.panel.addEventListener("popupshown", function onPopupShown() {

4
browser/components/customizableui/src/CustomizableUI.jsm
View File

@ -479,7 +479,6 @@ let CustomizableUIInternal = {
this.ensureButtonContextMenu(node, aAreaNode);
if (node.localName == "toolbarbutton") {
if (aArea == CustomizableUI.AREA_PANEL) {
node.setAttribute("tabindex", "0");
node.setAttribute("wrap", "true");
} else {
node.removeAttribute("wrap");
@ -659,7 +658,6 @@ let CustomizableUIInternal = {
continue;
}
this.ensureButtonContextMenu(child, aPanel);
child.setAttribute("tabindex", "0");
child.setAttribute("wrap", "true");
}
@ -705,7 +703,6 @@ let CustomizableUIInternal = {
// We remove location attributes here to make sure they're gone too when a
// widget is removed from a toolbar to the palette. See bug 930950.
this.removeLocationAttributes(widgetNode);
widgetNode.removeAttribute("tabindex");
widgetNode.removeAttribute("wrap");
if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
container.removeChild(widgetNode);
@ -858,7 +855,6 @@ let CustomizableUIInternal = {
if (isNew) {
this.ensureButtonContextMenu(widgetNode, aAreaNode);
if (widgetNode.localName == "toolbarbutton" && areaId == CustomizableUI.AREA_PANEL) {
widgetNode.setAttribute("tabindex", "0");
widgetNode.setAttribute("wrap", "true");
}
}

4
browser/components/customizableui/src/CustomizableWidgets.jsm
View File

@ -100,7 +100,6 @@ const CustomizableWidgets = [{
let item = doc.createElementNS(kNSXUL, "toolbarbutton");
item.setAttribute("label", title || uri);
item.setAttribute("tabindex", "0");
item.setAttribute("targetURI", uri);
item.setAttribute("class", "subviewbutton");
item.addEventListener("command", function (aEvent) {
@ -256,7 +255,6 @@ const CustomizableWidgets = [{
item = doc.createElementNS(kNSXUL, "menuseparator");
} else if (node.localName == "menuitem") {
item = doc.createElementNS(kNSXUL, "toolbarbutton");
item.setAttribute("tabindex", "0");
item.setAttribute("class", "subviewbutton");
} else {
continue;
@ -367,8 +365,6 @@ const CustomizableWidgets = [{
node.appendChild(aDocument.createElementNS(kNSXUL, "separator"));
let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
setAttributes(btnNode, aButton);
if (inPanel)
btnNode.setAttribute("tabindex", "0");
node.appendChild(btnNode);
});

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

@ -354,12 +354,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY urlbar.accesskey "d">
<!ENTITY urlbar.switchToTab.label "Switch to tab:">
<!-- LOCALIZATION NOTE (toggleMenuPanelMac.key) ideally this should be the same as
toggleMenuPanel. However, the modifier is different on mac (cmd+shift rather than ctrl)
and so you may need to pick a different key to avoid conflicts with other shortcuts. -->
<!ENTITY toggleMenuPanel.key "m">
<!ENTITY toggleMenuPanelMac.key "m">
<!--
Comment duplicated from browser-sets.inc: