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

タブを移動した時のツリーの自動編集処理を修正

Browse Source 
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@1628 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2007-11-26 22:43:50 +00:00
parent bd4058afa0
commit 9117347b5b
2 changed files with 87 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
content/treestyletab/treestyletab.js
View File

@ -444,6 +444,14 @@ var TreeStyleTabService = {
);
return xpathResult.snapshotItem(xpathResult.snapshotLength-1);
},
getVisibleIndex : function(aTab)
{
return this.evaluateXPath(
'preceding-sibling::xul:tab[not(@'+this.kCOLLAPSED+'="true")]',
aTab
).snapshotLength;
},
/* tree manipulations */
@ -598,6 +606,42 @@ var TreeStyleTabService = {
}
return lastChild;
},
getChildIndex : function(aTab, aParent)
{
var parent = this.getParentTab(aTab);
if (!aParent) {
if (!parent) return -1;
}
else {
while (parent && parent != aParent)
{
aTab = parent;
parent = this.getParentTab(parent);
}
if (parent != aParent)
return -1;
aParent = parent;
}
if (aParent) {
var children = aParent.getAttribute(this.kCHILDREN);
var list = children.split('|');
var id = aTab.getAttribute(this.kID);
for (var i = 0, maxi = list.length; i < maxi; i++)
{
if (list[i] == id) return i;
}
return -1;
}
else {
var tabs = this.rootTabs;
for (var i = 0, maxi = tabs.length; i < maxi; i++)
{
if (tabs[i] == aTab) return i;
}
}
},
/* Session Store API */

75
content/treestyletab/treestyletabbrowser.js
View File

@ -1079,43 +1079,54 @@ TreeStyleTabBrowser.prototype = {
attachTabFromPosition : function(aTab, aOldPosition)
{
var nest = Number(aTab.getAttribute(this.kNEST) || 0);
var parent = this.getParentTab(aTab);
var prevParent = this.getParentTab(aTab.previousSibling);
var nextParent = this.getParentTab(aTab.nextSibling);
var prevNest = aTab.previousSibling ? Number(aTab.previousSibling.getAttribute(this.kNEST)) : -1 ;
var nextNest = aTab.hasAttribute(this.kCHILDREN) ? (
var parent = this.getParentTab(aTab);
var prevTab = aTab.previousSibling;
var nextTab = aTab.nextSibling;
var prevParent = this.getParentTab(prevTab);
var prevLevel = aTab.previousSibling ? Number(prevTab.getAttribute(this.kNEST)) : -1 ;
var nextParent = this.getParentTab(nextTab);
var nextLevel = aTab.hasAttribute(this.kCHILDREN) ? (
this.getNextSiblingTab(aTab) ? Number(this.getNextSiblingTab(aTab).getAttribute(this.kNEST)) : 0
) :
aTab.nextSibling ? Number(aTab.nextSibling.getAttribute(this.kNEST)) : -1 ;
nextTab ? Number(nextTab.getAttribute(this.kNEST)) : -1 ;
if (aOldPosition === void(0)) aOldPosition = aTab._tPos;
if (!aTab.previousSibling) {
this.partTab(aTab);
var pos = this.getChildIndex(aTab, parent);
var oldPos = this.getChildIndex(this.mTabBrowser.mTabContainer.childNodes[aOldPosition], parent);
if (pos < 0 || oldPos < 0) {
pos = this.getVisibleIndex(aTab);
oldPos = this.getVisibleIndex(this.mTabBrowser.mTabContainer.childNodes[aOldPosition]);
}
else if (
prevParent == nextParent ||
(
(!aTab.nextSibling || prevNest > nextNest) &&
aOldPosition < aTab._tPos &&
aTab._tPos - aOldPosition < 2
)
) {
if (prevParent)
this.attachTabTo(aTab, prevParent, { insertBefore : aTab.nextSibling });
var delta = Math.abs(pos - oldPos);
if (pos < oldPos) delta--;
var newParent = null;
if (!prevTab) {
}
else if (!nextTab) {
newParent = (delta > 1) ? prevParent : parent ;
}
else if (prevParent == nextParent) {
newParent = prevParent;
}
else if (prevLevel > nextLevel) {
newParent = (delta > 1) ? prevParent : this.getParentTab(prevParent) ;
}
else if (prevLevel < nextLevel) {
newParent = aTab.previousSibling;
}
if (newParent != parent) {
if (newParent)
this.attachTabTo(aTab, newParent, { insertBefore : aTab.nextSibling });
else
this.partTab(aTab);
}
else if (prevNest > nextNest) {
if (parent && prevParent && parent != prevParent)
this.attachTabTo(aTab, prevParent, { insertBefore : aTab.nextSibling });
else
this.partTab(aTab);
}
else if (prevNest < nextNest) {
this.attachTabTo(aTab, aTab.previousSibling, { insertBefore : aTab.nextSibling });
}
},
updateChildrenArray : function(aTab)
@ -1614,9 +1625,9 @@ TreeStyleTabBrowser.prototype = {
info.insertBefore = tabs[0];
}
else {
var prevNest = Number(prevTab.getAttribute(this.kNEST));
var prevLevel = Number(prevTab.getAttribute(this.kNEST));
var targetNest = Number(tab.getAttribute(this.kNEST));
info.parent = (prevNest < targetNest) ? prevTab : this.getParentTab(tab) ;
info.parent = (prevLevel < targetNest) ? prevTab : this.getParentTab(tab) ;
info.action = this.kACTION_MOVE | (info.parent ? this.kACTION_ATTACH : this.kACTION_PART );
info.insertBefore = tab;
}
@ -1642,8 +1653,8 @@ TreeStyleTabBrowser.prototype = {
}
else {
var targetNest = Number(tab.getAttribute(this.kNEST));
var nextNest = Number(nextTab.getAttribute(this.kNEST));
info.parent = (targetNest < nextNest) ? tab : this.getParentTab(tab) ;
var nextLevel = Number(nextTab.getAttribute(this.kNEST));
info.parent = (targetNest < nextLevel) ? tab : this.getParentTab(tab) ;
info.action = this.kACTION_MOVE | (info.parent ? this.kACTION_ATTACH : this.kACTION_PART );
info.insertBefore = nextTab;
}