ツリー全体を復元する機能はundoCloseTab()を使った時だけに限定するようにした
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@6087 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
parent
7b0e3fbca7
commit
a0ecb16062
@ -144,6 +144,20 @@ var TreeStyleTabService = {
|
||||
)
|
||||
);
|
||||
|
||||
if ('undoCloseTab' in window) {
|
||||
eval('window.undoCloseTab = '+
|
||||
window.undoCloseTab.toSource().replace(
|
||||
/(\btab\s*=\s*[^\.]+\.undoCloseTab\([^;]+\);)/,
|
||||
<![CDATA[
|
||||
gBrowser.__treestyletab__readyToUndoCloseTab = true;
|
||||
$1
|
||||
tab.__treestyletab__restoredByUndoCloseTab = true;
|
||||
delete gBrowser.__treestyletab__readyToUndoCloseTab;
|
||||
]]>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
this.overrideExtensionsPreInit(); // hacks.js
|
||||
|
||||
this.registerTabFocusAllowance(this.defaultTabFocusAllowance);
|
||||
|
@ -2184,6 +2184,8 @@ TreeStyleTabBrowser.prototype = {
|
||||
{
|
||||
var behavior = this.undoCloseTabSetBehavior(0, true);
|
||||
if (
|
||||
aRestoredTab.__treestyletab__restoredByUndoCloseTab ||
|
||||
!this.browser.__treestyletab__readyToUndoCloseTab ||
|
||||
this.useTMPSessionAPI ||
|
||||
this._restoringClosedSet ||
|
||||
!(behavior & this.kUNDO_CLOSE_SET || behavior & this.kUNDO_ASK)
|
||||
@ -2237,6 +2239,8 @@ TreeStyleTabBrowser.prototype = {
|
||||
|
||||
onTabRestored : function TSTBrowser_onTabRestored(aEvent)
|
||||
{
|
||||
delete aEvent.originalTarget.__treestyletab__restoredByUndoCloseTab;
|
||||
|
||||
// update the status for the next restoring
|
||||
if (!this.useTMPSessionAPI && TreeStyleTabService.restoringWindow)
|
||||
TreeStyleTabService.restoringWindow = TreeStyleTabService.getRestoringTabsCount() > 0;
|
||||
|
Loading…
Reference in New Issue
Block a user