* ふりだしにもどる
* サブツリーの開閉状態をセッションからきちんと復元 git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@5152 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
parent
501a1518c4
commit
451a88b33e
@ -561,11 +561,11 @@ TreeStyleTabBrowser.prototype = {
|
|||||||
if (!aTab.hasAttribute(this.kID)) {
|
if (!aTab.hasAttribute(this.kID)) {
|
||||||
var id = this.getTabValue(aTab, this.kID) || this.makeNewId();
|
var id = this.getTabValue(aTab, this.kID) || this.makeNewId();
|
||||||
aTab.setAttribute(this.kID, id);
|
aTab.setAttribute(this.kID, id);
|
||||||
|
aTab.setAttribute(this.kSUBTREE_COLLAPSED, true);
|
||||||
window.setTimeout(function(aSelf) {
|
window.setTimeout(function(aSelf) {
|
||||||
if (!aSelf.getTabValue(aTab, aSelf.kID))
|
if (!aSelf.getTabValue(aTab, aSelf.kID))
|
||||||
aSelf.setTabValue(aTab, aSelf.kID, id);
|
aSelf.setTabValue(aTab, aSelf.kID, id);
|
||||||
}, 0, this);
|
}, 0, this);
|
||||||
this.setTabValue(aTab, this.kSUBTREE_COLLAPSED, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
aTab.__treestyletab__linkedTabBrowser = this.mTabBrowser;
|
aTab.__treestyletab__linkedTabBrowser = this.mTabBrowser;
|
||||||
@ -1788,43 +1788,17 @@ TreeStyleTabBrowser.prototype = {
|
|||||||
this.updateTabsIndent([tab], undefined, undefined, aWithoutAnimation);
|
this.updateTabsIndent([tab], undefined, undefined, aWithoutAnimation);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tab.getAttribute(this.kID) != id) {
|
this.setTabValue(tab, this.kID, id);
|
||||||
this.setTabValue(tab, this.kID, id);
|
|
||||||
this.delayedRestoringTasks.push({
|
|
||||||
tab : tab,
|
|
||||||
withoutAnimation : aWithoutAnimation,
|
|
||||||
mayBeDuplicated : mayBeDuplicated
|
|
||||||
});
|
|
||||||
if (this.delayedRestoringTimer)
|
|
||||||
window.clearTimeout(this.delayedRestoringTimer);
|
|
||||||
this.delayedRestoringTimer = window.setTimeout(function(aSelf) {
|
|
||||||
aSelf.delayedRestoringTasks.forEach(function(aTask) {
|
|
||||||
aSelf.restoreStructureInternal(aTask.tab, aTask.withoutAnimation, aTask.mayBeDuplicated);
|
|
||||||
});
|
|
||||||
aSelf.delayedRestoringTasks = [];
|
|
||||||
aSelf.delayedRestoringTimer = null;
|
|
||||||
}, 100, this);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this.restoreStructureInternal(tab, aWithoutAnimation, mayBeDuplicated);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
delayedRestoringTimer : null,
|
|
||||||
delayedRestoringTasks : [],
|
|
||||||
restoreStructureInternal : function (aTab, aWithoutAnimation, aMayBeDuplicated)
|
|
||||||
{
|
|
||||||
var tab = aTab;
|
|
||||||
var b = this.mTabBrowser;
|
|
||||||
var id = this.getTabValue(tab, this.kID);
|
|
||||||
|
|
||||||
var isSubTreeCollapsed = (this.getTabValue(tab, this.kSUBTREE_COLLAPSED) == 'true');
|
var isSubTreeCollapsed = (this.getTabValue(tab, this.kSUBTREE_COLLAPSED) == 'true');
|
||||||
|
this.setTabValue(tab, this.kSUBTREE_COLLAPSED, isSubTreeCollapsed);
|
||||||
|
|
||||||
var children = this.getTabValue(tab, this.kCHILDREN);
|
var children = this.getTabValue(tab, this.kCHILDREN);
|
||||||
var tabs = [];
|
var tabs = [];
|
||||||
if (children) {
|
if (children) {
|
||||||
tab.removeAttribute(this.kCHILDREN);
|
tab.removeAttribute(this.kCHILDREN);
|
||||||
children = children.split('|');
|
children = children.split('|');
|
||||||
if (aMayBeDuplicated)
|
if (mayBeDuplicated)
|
||||||
children = children.map(function(aChild) {
|
children = children.map(function(aChild) {
|
||||||
return this.redirectId(aChild);
|
return this.redirectId(aChild);
|
||||||
}, this);
|
}, this);
|
||||||
@ -1841,12 +1815,12 @@ TreeStyleTabBrowser.prototype = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var nextTab = this.getTabValue(tab, this.kINSERT_BEFORE);
|
var nextTab = this.getTabValue(tab, this.kINSERT_BEFORE);
|
||||||
if (nextTab && aMayBeDuplicated) nextTab = this.redirectId(nextTab);
|
if (nextTab && mayBeDuplicated) nextTab = this.redirectId(nextTab);
|
||||||
nextTab = this.getTabById(nextTab);
|
nextTab = this.getTabById(nextTab);
|
||||||
|
|
||||||
if (!nextTab) {
|
if (!nextTab) {
|
||||||
var prevTab = this.getTabValue(tab, this.kINSERT_AFTER);
|
var prevTab = this.getTabValue(tab, this.kINSERT_AFTER);
|
||||||
if (prevTab && aMayBeDuplicated) prevTab = this.redirectId(prevTab);
|
if (prevTab && mayBeDuplicated) prevTab = this.redirectId(prevTab);
|
||||||
nextTab = this.getNextSiblingTab(this.getTabById(prevTab));
|
nextTab = this.getNextSiblingTab(this.getTabById(prevTab));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1854,7 +1828,7 @@ TreeStyleTabBrowser.prototype = {
|
|||||||
var parent = null;
|
var parent = null;
|
||||||
for (var i in ancestors)
|
for (var i in ancestors)
|
||||||
{
|
{
|
||||||
if (aMayBeDuplicated) ancestors[i] = this.redirectId(ancestors[i]);
|
if (mayBeDuplicated) ancestors[i] = this.redirectId(ancestors[i]);
|
||||||
parent = this.getTabById(ancestors[i]);
|
parent = this.getTabById(ancestors[i]);
|
||||||
if (parent) {
|
if (parent) {
|
||||||
parent = ancestors[i];
|
parent = ancestors[i];
|
||||||
@ -1905,7 +1879,7 @@ TreeStyleTabBrowser.prototype = {
|
|||||||
this.collapseExpandSubtree(tab, isSubTreeCollapsed, aWithoutAnimation);
|
this.collapseExpandSubtree(tab, isSubTreeCollapsed, aWithoutAnimation);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aMayBeDuplicated) this.clearRedirectionTable();
|
if (mayBeDuplicated) this.clearRedirectionTable();
|
||||||
},
|
},
|
||||||
|
|
||||||
redirectId : function(aId)
|
redirectId : function(aId)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user