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

Attach duplicated tabs to the specified parent after they are completely duplicated

Browse Source
This commit is contained in:
YUKI Hiroshi 2016-08-26 20:01:42 +09:00
parent 381578a0eb
commit 40d47c2a8a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/browser.js
View File

@ -6531,15 +6531,16 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
if (aOptions.duplicate) {
aTab = this.duplicateTabAsOrphan(aTab);
let promise = new Promise(function(aResolve, aReject) {
aTab.__treestyletab__promisedDuplicatedTab = new Promise(function(aResolve, aReject) {
let onTabRestoring = function() {
aTab.removeEventListener('SSTabRestoring', onTabRestoring, false);
delete aTab.__treestyletab__promisedDuplicatedTab;
aResolve(aTab);
};
aTab.addEventListener('SSTabRestoring', onTabRestoring, false);
});
newTabs.push(aTab);
promisedDuplicatedTabs.push(promise);
promisedDuplicatedTabs.push(aTab.__treestyletab__promisedDuplicatedTab);
}
else if (sourceService != this) {
aTab = this.importTab(aTab);

12
modules/tabbarDNDObserver.js
View File

@ -598,13 +598,17 @@ catch(e) {
}).bind(this), 0);
if (newTabs.length && aInfo.action & sv.kACTION_ATTACH) {
Promise.all(newTabs.map((aTab) => aTab.__treestyletab__promisedDuplicatedTab))
.then((function() {
log(' => attach (last)');
this.attachTabsOnDrop(
newTabs.filter(function(aTab, aIndex) {
return treeStructure[aIndex] == -1;
}),
aInfo.parent
aInfo.parent,
aInfo.insertBefore
);
}).bind(this));
}
log(' => finished');
@ -647,7 +651,7 @@ catch(e) {
};
},
attachTabsOnDrop : function TabbarDND_attachTabsOnDrop(aTabs, aParent)
attachTabsOnDrop : function TabbarDND_attachTabsOnDrop(aTabs, aParent, aInsertBefore)
{
log('attachTabsOnDrop: start');
var b = aTabs[0].ownerDocument.defaultView.TreeStyleTabService.getTabBrowserFromChild(aTabs[0]);
@ -659,7 +663,9 @@ catch(e) {
let tab = aTabs[i];
if (!tab.parentNode) continue; // ignore removed tabs
if (aParent)
sv.attachTabTo(tab, aParent);
sv.attachTabTo(tab, aParent, {
insertBefore : aInsertBefore
});
else
sv.detachTab(tab);
sv.collapseExpandTab(tab, false);