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 585830 - A closing tab can be switched to with Ctrl+PageUp/PageDown. r=dao

Browse Source
This commit is contained in:
Sindre Dammann 2010-08-25 15:16:33 +02:00
parent 1dfccaacbb
commit 78bdd52f91
4 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
browser/base/content/tabbrowser.xml
View File

@ -2866,6 +2866,15 @@
this.mTabstrip._updateScrollButtonsDisabledState();
]]></body>
</method>
<method name="_canAdvanceToTab">
<parameter name="aTab"/>
<body>
<![CDATA[
return this.tabbrowser._removingTabs.indexOf(aTab) == -1;
]]>
</body>
</method>
<!-- Deprecated stuff, implemented for backwards compatibility. -->
<property name="mTabstripClosebutton" readonly="true"

1
browser/base/content/test/Makefile.in
View File

@ -142,6 +142,7 @@ _BROWSER_FILES = \
browser_bug577121.js \
browser_bug580956.js \
browser_bug581242.js \
browser_bug585830.js \
browser_contextSearchTabPosition.js \
browser_ctrlTab.js \
browser_discovery.js \

57
browser/base/content/test/browser_bug585830.js Normal file
View File

@ -0,0 +1,57 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is bug 585830 test.
*
* The Initial Developer of the Original Code is
* Sindre Dammann <sindrebugzilla@gmail.com>
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
function test() {
let tab1 = gBrowser.selectedTab;
let tab2 = gBrowser.addTab("about:blank", {skipAnimation: true});
let tab3 = gBrowser.addTab();
gBrowser.selectedTab = tab2;
gBrowser.removeCurrentTab({animate: true});
gBrowser.tabContainer.advanceSelectedTab(-1, true);
is(gBrowser.selectedTab, tab1, "First tab should be selected");
gBrowser.removeTab(tab2);
// test for "null has no properties" fix. See Bug 585830 Comment 13
gBrowser.removeCurrentTab({animate: true});
try {
gBrowser.tabContainer.advanceSelectedTab(-1, false);
} catch(err) {
ok(false, "Shouldn't throw");
}
gBrowser.removeTab(tab1);
}

13
toolkit/content/widgets/tabbox.xml
View File

@ -458,12 +458,12 @@
<body>
<![CDATA[
var requestedTab = aNewTab;
while (aNewTab.hidden || aNewTab.disabled) {
while (aNewTab.hidden || aNewTab.disabled || !this._canAdvanceToTab(aNewTab)) {
aNewTab = aFallbackDir == -1 ? aNewTab.previousSibling : aNewTab.nextSibling;
if (!aNewTab && aWrap)
aNewTab = aFallbackDir == -1 ? this.childNodes[this.childNodes.length - 1] :
this.childNodes[0];
if (aNewTab == requestedTab)
if (!aNewTab || aNewTab == requestedTab)
return;
}
@ -495,6 +495,15 @@
</body>
</method>
<method name="_canAdvanceToTab">
<parameter name="aTab"/>
<body>
<![CDATA[
return true;
]]>
</body>
</method>
<method name="advanceSelectedTab">
<parameter name="aDir"/>
<parameter name="aWrap"/>