Refactor mouse drag and drop (#61) (closed #21)

onemen · Aug 16, 2021 · 29bbd1a · 29bbd1a
1 parent 316280c
commit 29bbd1a
Show file tree

Hide file tree

Showing 42 changed files with 432 additions and 846 deletions.
diff --git a/addon/chrome/content/click/click.js b/addon/chrome/content/click/click.js
@@ -350,7 +350,20 @@ var TabmixTabClickOptions = {
       return;
 
     aEvent.preventDefault();
-  }
+  },
+
+  /**
+   * block mouse down with modifiers if the modifier is used by our clicking option
+   */
+  blockMouseDown(event) {
+    if (event.shiftKey && Tabmix.prefs.getIntPref("shiftClickTab") != -1 ||
+      event.altKey && Tabmix.prefs.getIntPref("altClickTab") != -1 ||
+      (event.ctrlKey || event.metaKey) && Tabmix.prefs.getIntPref("ctrlClickTab") != -1
+    ) {
+      return true;
+    }
+    return false;
+  },
 };
 
 var TabmixContext = {

diff --git a/addon/chrome/content/links/setup.js b/addon/chrome/content/links/setup.js
@@ -153,10 +153,8 @@ Tabmix.beforeStartup = function TMP_beforeStartup(tabBrowser, aTabContainer) {
     return this.isBlankBrowser(this.getBrowserForTab(aTab));
   };
 
-  //XXX isTabEmpty exist in Firefox 4.0 - same as isBlankNotBusyTab
-  // isTabEmpty don't check for Tabmix.isNewTabUrls
   tabBrowser.isBlankNotBusyTab = function TMP_isBlankNotBusyTab(aTab, aboutBlank) {
-    if (aTab.hasAttribute("busy") || aTab.hasAttribute("pending"))
+    if (aTab.hasAttribute("busy"))
       return false;
 
     return this.isBlankBrowser(this.getBrowserForTab(aTab), aboutBlank);