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@4064 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2009-04-07 14:36:31 +00:00
parent 6e57346892
commit fa18f6d75a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/treestyletab/treestyletabbrowser.js
View File

@ -2218,6 +2218,7 @@ TreeStyleTabBrowser.prototype = {
var tab = aEvent.target; var tab = aEvent.target;
var b = this.mTabBrowser; var b = this.mTabBrowser;
var tabs = this.getTabsArray(b); var tabs = this.getTabsArray(b);
var lastTabIndex = tabs.length -1;
var isInverted = this.isVertical ? false : window.getComputedStyle(b.parentNode, null).direction == 'rtl'; var isInverted = this.isVertical ? false : window.getComputedStyle(b.parentNode, null).direction == 'rtl';
var info = { var info = {
target : null, target : null,
@ -2239,14 +2240,14 @@ TreeStyleTabBrowser.prototype = {
info.action = action; info.action = action;
return info; return info;
} }
else if (aEvent[this.positionProp] > tabs[tabs.length-1].boxObject[this.positionProp] + tabs[tabs.length-1].boxObject[this.sizeProp]) { else if (aEvent[this.positionProp] > tabs[lastTabIndex].boxObject[this.positionProp] + tabs[lastTabIndex].boxObject[this.sizeProp]) {
info.target = info.parent = tabs[tabs.length-1]; info.target = info.parent = tabs[lastTabIndex];
info.position = isInverted ? this.kDROP_BEFORE : this.kDROP_AFTER ; info.position = isInverted ? this.kDROP_BEFORE : this.kDROP_AFTER ;
info.action = action; info.action = action;
return info; return info;
} }
else { else {
info.target = tabs[Math.min(b.getNewIndex(aEvent), tabs.length - 1)]; info.target = tabs[Math.min(b.getNewIndex(aEvent), lastTabIndex)];
} }
} }
else { else {
@ -2402,6 +2403,7 @@ TreeStyleTabBrowser.prototype = {
sourceBrowser.treeStyleTab.getParentTab(aTab) : null ; sourceBrowser.treeStyleTab.getParentTab(aTab) : null ;
}, this); }, this);
var lastTabIndex = tabs.length -1;
draggedTabs.forEach(function(aTab, aIndex) { draggedTabs.forEach(function(aTab, aIndex) {
var tab = aTab; var tab = aTab;
if (aInfo.action & this.kACTIONS_FOR_DESTINATION) { if (aInfo.action & this.kACTIONS_FOR_DESTINATION) {
@ -2428,9 +2430,10 @@ TreeStyleTabBrowser.prototype = {
MultipleTabService.setSelection(tab, true); MultipleTabService.setSelection(tab, true);
if (!parent || draggedTabs.indexOf(parent) < 0) if (!parent || draggedTabs.indexOf(parent) < 0)
newRoots.push(tab); newRoots.push(tab);
lastTabIndex++;
} }
var newIndex = aInfo.insertBefore ? aInfo.insertBefore._tPos : tabs.length - 1 ; var newIndex = aInfo.insertBefore ? aInfo.insertBefore._tPos : lastTabIndex ;
if (aInfo.insertBefore && newIndex > tab._tPos) newIndex--; if (aInfo.insertBefore && newIndex > tab._tPos) newIndex--;
this.internallyTabMoving = true; this.internallyTabMoving = true;