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

drag and drop of tabs between windows was broken (regression)

Browse Source
This commit is contained in:
Piro / SHIMODA Hiroshi 2011-05-28 06:21:48 +09:00
parent eb95f17dbb
commit cf8d2072a4
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/tabbarDNDObserver.js
View File

@ -511,20 +511,22 @@ catch(e) {
if (aInfo.action & sv.kACTIONS_FOR_DESTINATION) {
let parent = parentTabsArray[i];
if (tabsInfo.isMultipleMove && 'MultipleTabService' in sourceWindow)
sourceWindow.MultipleTabService.setSelection(aTab, false);
sourceWindow.MultipleTabService.setSelection(tab, false);
if (aInfo.action & sv.kACTION_IMPORT) {
tab = targetBrowser.addTab();
tab.linkedBrowser.stop();
tab.linkedBrowser.docShell;
targetBrowser.swapBrowsersAndCloseOther(tab, aTab);
targetBrowser.setTabTitle(tab);
let newTab = targetBrowser.addTab();
newTab.linkedBrowser.stop();
newTab.linkedBrowser.docShell;
targetBrowser.swapBrowsersAndCloseOther(newTab, tab);
targetBrowser.setTabTitle(newTab);
tab = newTab;
}
else {
tab = targetBrowser.duplicateTab(aTab);
sv.deleteTabValue(tab, sv.kCHILDREN);
sv.deleteTabValue(tab, sv.kPARENT);
newTab = targetBrowser.duplicateTab(tab);
sv.deleteTabValue(newTab, sv.kCHILDREN);
sv.deleteTabValue(newTab, sv.kPARENT);
if (aInfo.action & sv.kACTION_IMPORT)
oldTabs.push(aTab);
oldTabs.push(tab);
tab = newTab;
}
newTabs.push(tab);
if (tabsInfo.isMultipleMove && 'MultipleTabService' in w)
@ -546,7 +548,7 @@ catch(e) {
// close imported tabs from the source browser
for each (let tab in oldTabs)
{
sourceBrowser.removeTab(aTab, { animate : true });
sourceBrowser.removeTab(tab, { animate : true });
}
if (shouldClose)
this.closeOwner(sourceBrowser);