Bug 456382 - mousing on last tab shouldn't close window (middle click, close button, context menu). ui-r=beltzner, r=gavin

This commit is contained in:
Tuukka Tolvanen 2009-01-15 15:16:23 +01:00
parent 489f8ec766
commit 34c1fe66da

View File

@ -119,7 +119,7 @@
<xul:menuseparator/>
<xul:menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
oncommand="var tabbrowser = this.parentNode.parentNode.parentNode.parentNode;
tabbrowser.removeTab(tabbrowser.mContextTab);"/>
tabbrowser.removeClickedTab(tabbrowser.mContextTab);"/>
</xul:menupopup>
<xul:tabs class="tabbrowser-tabs" flex="1"
@ -1015,7 +1015,7 @@
if (event.button != 1 || event.target.localName != 'tab')
return;
this.removeTab(event.target);
this.removeClickedTab(event.target);
event.stopPropagation();
]]>
</body>
@ -1497,6 +1497,15 @@
</body>
</method>
<method name="removeClickedTab">
<parameter name="aTab"/>
<body>
<![CDATA[
this._endRemoveTab(this._beginRemoveTab(aTab, true, false));
]]>
</body>
</method>
<!-- Returns everything that _endRemoveTab needs in an array. -->
<method name="_beginRemoveTab">
<parameter name="aTab"/>
@ -3292,7 +3301,7 @@
// Reset the "ignored click" flag
this._ignoredClick = false;
tabbedBrowser.removeTab(bindingParent);
tabbedBrowser.removeClickedTab(bindingParent);
tabbedBrowser._blockDblClick = true;
/* XXXmano hack (see bug 343628):