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@5031 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2009-09-01 14:39:01 +00:00
parent 9294210897
commit b514106153
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
content/treestyletab/treestyletabbrowser.js
View File

@ -1687,15 +1687,30 @@ TreeStyleTabBrowser.prototype = {
) )
return; return;
this.attachTabFromPosition(tab); this.attachTabFromPosition(tab, aEvent.detail);
this.showTabbarForFeedback(); this.showTabbarForFeedback();
}, },
attachTabFromPosition : function(aTab) attachTabFromPosition : function(aTab, aOldPosition)
{ {
var parent = this.getParentTab(aTab); var parent = this.getParentTab(aTab);
if (aOldPosition === void(0)) aOldPosition = aTab._tPos;
var pos = this.getChildIndex(aTab, parent);
var oldPos = this.getChildIndex(this.getTabs(this.mTabBrowser).snapshotItem(aOldPosition), parent);
var delta;
if (pos == oldPos) { // no move?
return;
}
else if (pos < 0 || oldPos < 0) {
delta = 2;
}
else {
delta = Math.abs(pos - oldPos);
}
var prevTab = this.getPreviousTab(aTab); var prevTab = this.getPreviousTab(aTab);
var nextTab = this.getNextTab(aTab); var nextTab = this.getNextTab(aTab);
@ -1712,19 +1727,20 @@ TreeStyleTabBrowser.prototype = {
var newParent; var newParent;
if (!prevTab) { if (!prevTab) { // moved to topmost position
newParent = null; newParent = null;
} }
else if (!nextTab) { else if (!nextTab) { // moved to last position
newParent = prevParent || parent ; newParent = (delta > 1) ? prevParent : parent ;
} }
else if (prevParent == nextParent) { else if (prevParent == nextParent) { // moved into existing tree
newParent = prevParent; newParent = prevParent;
} }
else if (prevLevel > nextLevel) { else if (prevLevel > nextLevel) { // moved to end of existing tree
newParent = prevParent || parent || nextParent; var realDelta = Math.abs(aTab._tPos - aOldPosition);
newParent = realDelta < 2 ? prevParent : (parent || nextParent) ;
} }
else if (prevLevel < nextLevel) { else if (prevLevel < nextLevel) { // moved to first child position of existing tree
newParent = parent || nextParent; newParent = parent || nextParent;
} }