stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

restore _lastRelatedTab on the last point of onTabAdded()

Browse Source
This commit is contained in:
SHIMODA Hiroshi 2011-07-29 10:34:44 +09:00
parent ee95b8c7c0
commit 3bbf28b4f0
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/browser.js
View File

@ -2457,6 +2457,7 @@ TreeStyleTabBrowser.prototype = {
var hasStructure = this.treeStructure && this.treeStructure.length; var hasStructure = this.treeStructure && this.treeStructure.length;
var pareintIndexInTree = hasStructure ? this.treeStructure.shift() : 0 ; var pareintIndexInTree = hasStructure ? this.treeStructure.shift() : 0 ;
var lastRelatedTab = b._lastRelatedTab;
if (this.readiedToAttachNewTab) { if (this.readiedToAttachNewTab) {
if (pareintIndexInTree < 0) { // there is no parent, so this is a new parent! if (pareintIndexInTree < 0) { // there is no parent, so this is a new parent!
@ -2469,18 +2470,9 @@ TreeStyleTabBrowser.prototype = {
parent = pareintIndexInTree < tabs.length ? tabs[pareintIndexInTree] : parent ; parent = pareintIndexInTree < tabs.length ? tabs[pareintIndexInTree] : parent ;
} }
if (parent) { if (parent) {
let lastRelatedTab = b._lastRelatedTab;
this.attachTabTo(tab, parent, { this.attachTabTo(tab, parent, {
dontExpand : this.shouldExpandAllTree dontExpand : this.shouldExpandAllTree
}); });
/**
* gBrowser.addTab() resets gBrowser._lastRelatedTab.owner
* when a new background tab is opened from links in the current
* tab, but it will fail with TST because moveTab() clears
* gBrowser._lastRelatedTab.
* So, we have to restore gBrowser._lastRelatedTab manually.
*/
b._lastRelatedTab = lastRelatedTab;
} }
let refTab; let refTab;
@ -2507,16 +2499,7 @@ TreeStyleTabBrowser.prototype = {
if (newIndex > -1) { if (newIndex > -1) {
if (newIndex > tab._tPos) newIndex--; if (newIndex > tab._tPos) newIndex--;
this.internallyTabMovingCount++; this.internallyTabMovingCount++;
let lastRelatedTab = b._lastRelatedTab;
b.moveTabTo(tab, newIndex); b.moveTabTo(tab, newIndex);
/**
* gBrowser.addTab() resets gBrowser._lastRelatedTab.owner
* when a new background tab is opened from links in the current
* tab, but it will fail with TST because moveTab() clears
* gBrowser._lastRelatedTab.
* So, we have to restore gBrowser._lastRelatedTab manually.
*/
b._lastRelatedTab = lastRelatedTab;
this.internallyTabMovingCount--; this.internallyTabMovingCount--;
} }
@ -2571,6 +2554,16 @@ TreeStyleTabBrowser.prototype = {
if (tabs.length == 2) if (tabs.length == 2)
this.updateInvertedTabContentsOrder(tabs); this.updateInvertedTabContentsOrder(tabs);
/**
* gBrowser.adthis._changeTabbarPosition(position);
dTab() resets gBrowser._lastRelatedTab.owner
* when a new background tab is opened from the current tab,
* but it will fail with TST because gBrowser.moveTab() (called
* by TST) clears gBrowser._lastRelatedTab.
* So, we have to restore gBrowser._lastRelatedTab manually.
*/
b._lastRelatedTab = lastRelatedTab;
return true; return true;
}, },
_addedCountInThisLoop : 0, _addedCountInThisLoop : 0,