Skip to content

Commit 793e275

Browse files
author
Sandor Molnar
committed
Revert "Bug 1980240 - Refactor tabs drag and drop code into its own module r=tabbrowser-reviewers,sthompson" for causing bc failures @ browser_tabdetach.js
This reverts commit 6eba594.
1 parent f4ae53b commit 793e275

File tree

6 files changed

+3007
-3132
lines changed

6 files changed

+3007
-3132
lines changed

browser/base/content/browser-main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
Services.scriptloader.loadSubScript("chrome://browser/content/sidebar/browser-sidebar.js", this);
2222
Services.scriptloader.loadSubScript("chrome://browser/content/browser-customtitlebar.js", this);
2323
Services.scriptloader.loadSubScript("chrome://browser/content/browser-unified-extensions.js", this);
24-
Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser/drag-and-drop.js", this);
2524
Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser/tab.js", this);
2625
Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser/tabbrowser.js", this);
2726
Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser/tabgroup.js", this);

browser/components/tabbrowser/TabsList.sys.mjs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -706,13 +706,9 @@ export class TabsPanel extends TabsListBase {
706706
? getTabGroupFromRow(row).labelElement
707707
: getTabFromRow(row);
708708

709-
this.gBrowser.tabContainer.tabDragAndDrop.startTabDrag(
710-
event,
711-
elementToDrag,
712-
{
713-
fromTabList: true,
714-
}
715-
);
709+
this.gBrowser.tabContainer.startTabDrag(event, elementToDrag, {
710+
fromTabList: true,
711+
});
716712
}
717713

718714
/**
@@ -728,8 +724,7 @@ export class TabsPanel extends TabsListBase {
728724
* @returns {boolean}
729725
*/
730726
_isMovingTabs(event) {
731-
var effects =
732-
this.gBrowser.tabContainer.tabDragAndDrop.getDropEffectForTabDrag(event);
727+
var effects = this.gBrowser.tabContainer.getDropEffectForTabDrag(event);
733728
return effects == "move";
734729
}
735730

0 commit comments

Comments
 (0)