зеркало из https://github.com/mozilla/gecko-dev.git
Bug 251513. Content of tabs not focused to keyboard scrolling when switching tabs. r=mconner, no sr= needed
This commit is contained in:
Родитель
6b7dd74605
Коммит
a94a11bfab
|
@ -347,7 +347,7 @@
|
||||||
var cancel = false;
|
var cancel = false;
|
||||||
const IController = Components.interfaces.nsIAutoCompleteController;
|
const IController = Components.interfaces.nsIAutoCompleteController;
|
||||||
|
|
||||||
if (!this.disableKeyNavigation) {
|
if (!this.disableKeyNavigation && !aEvent.ctrlKey && !aEvent.altKey) {
|
||||||
switch (aEvent.keyCode) {
|
switch (aEvent.keyCode) {
|
||||||
case KeyEvent.DOM_VK_TAB:
|
case KeyEvent.DOM_VK_TAB:
|
||||||
if (this.tabScrolling && this.popup.mPopupOpen)
|
if (this.tabScrolling && this.popup.mPopupOpen)
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
|
|
||||||
<content>
|
<content>
|
||||||
<xul:stringbundle src="chrome://global/locale/tabbrowser.properties"/>
|
<xul:stringbundle src="chrome://global/locale/tabbrowser.properties"/>
|
||||||
<xul:tabbox flex="1" xbl:inherits="handleCtrlPageUpDown"
|
<xul:tabbox flex="1" xbl:inherits="handleCtrlPageUpDown" eventnode="document"
|
||||||
onselect="if (!('updateCurrentBrowser' in this.parentNode) || event.target.localName != 'tabpanels') return; this.parentNode.updateCurrentBrowser();">
|
onselect="if (!('updateCurrentBrowser' in this.parentNode) || event.target.localName != 'tabpanels') return; this.parentNode.updateCurrentBrowser();">
|
||||||
<xul:hbox class="tabbrowser-strip chromeclass-toolbar" collapsed="true" tooltip="_child" context="_child">
|
<xul:hbox class="tabbrowser-strip chromeclass-toolbar" collapsed="true" tooltip="_child" context="_child">
|
||||||
<xul:tooltip onpopupshowing="event.preventBubble(); if (document.tooltipNode.hasAttribute('label')) { this.setAttribute('label', document.tooltipNode.getAttribute('label')); return true; } return false;"/>
|
<xul:tooltip onpopupshowing="event.preventBubble(); if (document.tooltipNode.hasAttribute('label')) { this.setAttribute('label', document.tooltipNode.getAttribute('label')); return true; } return false;"/>
|
||||||
|
@ -493,12 +493,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function setFocus(element) {
|
function setFocus(element) {
|
||||||
if (document.commandDispatcher.focusedElement &&
|
Components.lookupMethod(element, "focus").call(element);
|
||||||
document.commandDispatcher.focusedElement.parentNode ==
|
|
||||||
this.mCurrentTab.parentNode) {
|
|
||||||
// The focus is on a tab in the same tab panel
|
|
||||||
return; // If focus was on a tab, switching tabs focuses the new tab
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var whatToFocus = window.content;
|
var whatToFocus = window.content;
|
||||||
|
@ -1355,6 +1350,7 @@
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
this.mCurrentBrowser = this.mPanelContainer.firstChild;
|
this.mCurrentBrowser = this.mPanelContainer.firstChild;
|
||||||
this.mCurrentTab = this.mTabContainer.firstChild;
|
this.mCurrentTab = this.mTabContainer.firstChild;
|
||||||
|
this.mTabBox.handleCtrlTab = !/Mac/.test(navigator.platform);
|
||||||
]]>
|
]]>
|
||||||
</constructor>
|
</constructor>
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче