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

Update library

Browse Source
This commit is contained in:
Piro / YUKI Hiroshi 2016-09-04 14:28:02 +09:00
parent 5979c78513
commit e72e49304f
1 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
content/treestyletab/res/tabsDragUtils.js
View File

@ -1,5 +1,5 @@
/* /*
Multiple Tabs Drag and Drop Utilities for Firefox 31 or later Multiple Tabs Drag and Drop Utilities for Firefox 45 or later
Usage: Usage:
window['piro.sakura.ne.jp'].tabsDragUtils.initTabBrowser(gBrowser); window['piro.sakura.ne.jp'].tabsDragUtils.initTabBrowser(gBrowser);
@ -15,7 +15,7 @@
http://github.com/piroor/fxaddonlib-tabs-drag-utils http://github.com/piroor/fxaddonlib-tabs-drag-utils
*/ */
(function() { (function() {
const currentRevision = 35; const currentRevision = 36;
if (!('piro.sakura.ne.jp' in window)) window['piro.sakura.ne.jp'] = {}; if (!('piro.sakura.ne.jp' in window)) window['piro.sakura.ne.jp'] = {};
@ -89,7 +89,7 @@
) { ) {
let original = PlacesControllerDragHelper.onDrop; let original = PlacesControllerDragHelper.onDrop;
PlacesControllerDragHelper.__TabsDragUtils_original__onDrop = original; PlacesControllerDragHelper.__TabsDragUtils_original__onDrop = original;
if (PlacesControllerDragHelper.onDrop.isAsyncFunction) { // Firefox 35 or later if (PlacesControllerDragHelper.onDrop.isAsyncFunction) {
PlacesControllerDragHelper.onDrop = Task.async(function(insertionPoint, dt) { PlacesControllerDragHelper.onDrop = Task.async(function(insertionPoint, dt) {
dt = new window["piro.sakura.ne.jp"].tabsDragUtils.DOMDataTransferProxy(dt, insertionPoint); dt = new window["piro.sakura.ne.jp"].tabsDragUtils.DOMDataTransferProxy(dt, insertionPoint);
// for Tree Style Tab (save tree structure to bookmarks) // for Tree Style Tab (save tree structure to bookmarks)
@ -106,24 +106,6 @@
}); });
}); });
} }
else { // Firefox 34 or older
eval('PlacesControllerDragHelper.onDrop = '+
original.toSource().replace(
// for Firefox 3.5 or later
/(let|var) doCopy =/,
'$1 tabsDataTransferProxy = dt = new window["piro.sakura.ne.jp"].tabsDragUtils.DOMDataTransferProxy(dt, insertionPoint); $&'
).replace( // for Tree Style Tab (save tree structure to bookmarks)
/(PlacesUIUtils\.ptm|PlacesUtils\.transactionManager)\.doTransaction\(txn\);/,
'if (tabsDataTransferProxy && "_tabs" in tabsDataTransferProxy &&' +
' "TreeStyleTabBookmarksService" in window)' +
' TreeStyleTabBookmarksService.beginAddBookmarksFromTabs(tabsDataTransferProxy._tabs);' +
'$&' +
'if (tabsDataTransferProxy && "_tabs" in tabsDataTransferProxy &&' +
' "TreeStyleTabBookmarksService" in window)' +
' TreeStyleTabBookmarksService.endAddBookmarksFromTabs();'
)
);
}
PlacesControllerDragHelper.__TabsDragUtils_updated__onDrop = PlacesControllerDragHelper.onDrop; PlacesControllerDragHelper.__TabsDragUtils_updated__onDrop = PlacesControllerDragHelper.onDrop;
} }
@ -159,20 +141,6 @@
{ {
this.updatedTabDNDObservers.push(aObserver); this.updatedTabDNDObservers.push(aObserver);
if (typeof aObserver._setEffectAllowedForDataTransfer === 'function') { // Firefox 43 and older
if (aObserver._setEffectAllowedForDataTransfer.toSource().indexOf('tabsDragUtils') < 0) {
let original = aObserver._setEffectAllowedForDataTransfer;
aObserver.__TabsDragUtils_original__setEffectAllowedForDataTransfer = original;
eval('aObserver._setEffectAllowedForDataTransfer = '+
original.toSource().replace(
'dt.mozItemCount > 1',
'$& && !window["piro.sakura.ne.jp"].tabsDragUtils.isTabsDragging(arguments[0])'
)
);
aObserver.__TabsDragUtils_updated__setEffectAllowedForDataTransfer = aObserver._setEffectAllowedForDataTransfer;
}
}
else { // Firefox 44 and later
if (typeof aObserver._getDropEffectForTabDrag === 'function' && if (typeof aObserver._getDropEffectForTabDrag === 'function' &&
aObserver._getDropEffectForTabDrag.toSource().indexOf('tabsDragUtils') < 0) { aObserver._getDropEffectForTabDrag.toSource().indexOf('tabsDragUtils') < 0) {
let original = aObserver._getDropEffectForTabDrag; let original = aObserver._getDropEffectForTabDrag;
@ -185,7 +153,6 @@
); );
aObserver.__TabsDragUtils_updated__getDropEffectForTabDrag = aObserver._getDropEffectForTabDrag; aObserver.__TabsDragUtils_updated__getDropEffectForTabDrag = aObserver._getDropEffectForTabDrag;
} }
}
if ('_animateTabMove' in aObserver && if ('_animateTabMove' in aObserver &&
aObserver._animateTabMove.toSource().indexOf('tabsDragUtils') < 0) { aObserver._animateTabMove.toSource().indexOf('tabsDragUtils') < 0) {