[Fix] _setEffectAllowedForDataTransfer changed in Fx44+

* The tabDragIndicator is still invisible when extensions.tabutils.disableTabMoveAnimation = true. #76 * https://bugzilla.mozilla.org/show_bug.cgi?id=1207594
yfdyh000 · Mar 20, 2016 · 114d23c · 114d23c
1 parent 446e2e0
commit 114d23c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/chrome/content/tabutils-mt.js b/chrome/content/tabutils-mt.js
@@ -75,7 +75,7 @@ tabutils._multirowTabs = function() {
     if (TU_getPref("extensions.tabutils.disableTabMoveAnimation", true)) {
       TU_hookFunc(arguments.callee.caller.toString().match(/^.*{|var (ind|tabStrip|ltr).*|var pixelsToScroll[\s\S]*$/g).join("\n"),
         [/.*scrollByPixels.*/, ";"],
-        [/.*effects == "move"[\s\S]*?(?=var (newIndex|scrollRect|rect))/, ""]
+        [/.*effects == "move"[\s\S]*?(?=var (newIndex|scrollRect|rect))/, ""] // needs fix
       ).apply(this, arguments);
       return;
     }

diff --git a/chrome/content/tabutils.js b/chrome/content/tabutils.js
@@ -1902,7 +1902,9 @@ tabutils._multiTabHandler = function() {
     }
   }, true);
 
-  TU_hookCode("gBrowser.mTabContainer._setEffectAllowedForDataTransfer",
+  TU_hookCode(typeof gBrowser.mTabContainer._setEffectAllowedForDataTransfer === 'function' ? 
+    "gBrowser.mTabContainer._setEffectAllowedForDataTransfer" : // Firefox 43 and older
+    "gBrowser.mTabContainer._getDropEffectForTabDrag", // Firefox 44 and later
     ["dt.mozItemCount > 1", "false"]
   );