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

trees around tabs duplicated by middle click on the "back" button were broken.

Browse Source
This commit is contained in:
Piro / SHIMODA Hiroshi 2011-05-04 23:13:37 +09:00
parent d587677d96
commit 7fb77b1e22
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
content/treestyletab/treestyletabbrowser.js
View File

@ -3080,7 +3080,12 @@ TreeStyleTabBrowser.prototype = {
tab.setAttribute(this.kID_RESTORING, id); tab.setAttribute(this.kID_RESTORING, id);
if (this.isTabDuplicated(tab)) { if (this.isTabDuplicated(tab)) {
mayBeDuplicated = true; mayBeDuplicated = true;
id = this.redirectId(id); /**
* If the tab has its ID as the attribute, then we should use it
* instead of redirected ID, because the tab has been possibly
* attached to another tab.
*/
id = tab.getAttribute(this.kID) || this.redirectId(id);
} }
tab.removeAttribute(this.kID_RESTORING); tab.removeAttribute(this.kID_RESTORING);
@ -3096,15 +3101,17 @@ TreeStyleTabBrowser.prototype = {
var closeSetId = null; var closeSetId = null;
if (!mayBeDuplicated) { if (!mayBeDuplicated) {
closeSetId = this.getTabValue(tab, this.kCLOSED_SET_ID); closeSetId = this.getTabValue(tab, this.kCLOSED_SET_ID);
/* If it has a parent, it is wrongly attacched by tab moving /**
on restoring. Restoring the old ID (the next statement) * If the tab is not a duplicated but it has a parent, then,
breaks the children list of the temporary parent and causes * it is wrongly attacched by tab moving on restoring.
many problems. So, to prevent these problems, I part the tab * Restoring the old ID (the next statement) breaks the children
from the temporary parent manually. * list of the temporary parent and causes many problems.
If the ID stored in the session equals to the value of the * So, to prevent these problems, I part the tab from the temporary
attribute stored in the element itself, then don't reset the * parent manually.
tab, because the restoring session is got from the tab itself. * If the ID stored in the session equals to the value of the
( like SS.setTabState(tab, SS.getTabState(tab)) ) * attribute stored in the element itself, then don't reset the
* tab, because the restoring session is got from the tab itself.
* ( like SS.setTabState(tab, SS.getTabState(tab)) )
*/ */
if (id != tab.getAttribute(this.kID)) if (id != tab.getAttribute(this.kID))
this.resetTab(tab, false); this.resetTab(tab, false);