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@1869 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2008-02-24 08:11:17 +00:00
parent c1d9a5e398
commit 1da510bc26
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/treestyletab/treestyletab.js
View File

@ -42,6 +42,7 @@ var TreeStyleTabService = {
kACTION_ATTACH : 2,
kACTION_PART : 4,
kACTION_DUPLICATE : 8,
kACTION_MOVE_FROM_OTHER_WINDOW : 16,
kTABBAR_TOP : 1,
kTABBAR_BOTTOM : 2,
@ -885,6 +886,12 @@ catch(e) {
if (dropActionInfo.position == TreeStyleTabService.kDROP_ON)
TSTTabBrowser.treeStyleTab.attachTabTo(newTab, dropActionInfo.target);
]]></>
).replace( // Firefox 3, dragging tab from another window
'else if (draggedTab) {',
<><![CDATA[$&
if (TSTTabBrowser.treeStyleTab.processDropAction(dropActionInfo, draggedTab))
return;
]]></>
).replace(
/(this.loadOneTab\([^;]+\));/,
<><![CDATA[

41
content/treestyletab/treestyletabbrowser.js
View File

@ -1668,9 +1668,17 @@ TreeStyleTabBrowser.prototype = {
if (aDragSession &&
aDragSession.sourceNode &&
aDragSession.sourceNode.localName == 'tab') {
if ('duplicateTab' in this.mTabBrowser &&
(navigator.platform.toLowerCase().indexOf('mac') == 0 ? aEvent.metaKey : aEvent.ctrlKey ))
if (
'duplicateTab' in this.mTabBrowser &&
(
(navigator.platform.toLowerCase().indexOf('mac') == 0 ? aEvent.metaKey : aEvent.ctrlKey ) ||
aDragSession.sourceNode.ownerDocument != document
)
) {
info.action = info.action | this.kACTION_DUPLICATE;
if (aDragSession.sourceNode.ownerDocument != document)
info.action = info.action | this.kACTION_MOVE_FROM_OTHER_WINDOW;
}
if (info.action & this.kACTION_ATTACH) {
var orig = aDragSession.sourceNode;
@ -1862,31 +1870,44 @@ TreeStyleTabBrowser.prototype = {
var tab, newIndex;
var newRoots = [];
var remoteWindow = aInfo.action & self.kACTION_MOVE_FROM_OTHER_WINDOW ? aDraggedTab.ownerDocument.defaultView : null ;
var remoteBrowser = remoteWindow ? remoteWindow.TreeStyleTabService.getTabBrowserFromChild(aDraggedTab) : null ;
var windowShouldBeClosed = (
remoteBrowser &&
remoteBrowser.mTabContainer.childNodes.length == draggedTabs.length
);
draggedTabs.forEach(function(aTab) {
var tab = aTab;
if (aInfo.action & self.kACTION_DUPLICATE) {
var parent = self.getParentTab(aTab);
var parent = self.getParentTab(tab);
if ('MultipleTabService' in window)
MultipleTabService.setSelection(aTab, false);
aTab = b.duplicateTab(aTab);
remoteWindow.MultipleTabService.setSelection(tab, false);
tab = b.duplicateTab(tab);
if ('MultipleTabService' in window)
MultipleTabService.setSelection(aTab, true);
MultipleTabService.setSelection(tab, true);
if (!parent || draggedTabs.indexOf(parent) < 0)
newRoots.push(aTab);
newRoots.push(tab);
}
newIndex = aInfo.insertBefore ? aInfo.insertBefore._tPos : tabs.length - 1 ;
if (aInfo.insertBefore && newIndex > aTab._tPos) newIndex--;
if (aInfo.insertBefore && newIndex > tab._tPos) newIndex--;
self.internallyTabMoving = true;
b.moveTabTo(aTab, newIndex);
self.collapseExpandTab(aTab, false);
b.moveTabTo(tab, newIndex);
self.collapseExpandTab(tab, false);
self.internallyTabMoving = false;
if (remoteBrowser)
remoteBrowser.removeTab(aTab);
});
if (aInfo.action & this.kACTION_DUPLICATE &&
aInfo.action & this.kACTION_ATTACH)
this.attachTabsOnDrop(newRoots, aInfo.parent);
if (windowShouldBeClosed)
remoteWindow.close();
b.movingSelectedTabs = false; // Multiple Tab Handler
b.duplicatingSelectedTabs = false; // Multiple Tab Handler
}