[Pkg-mozext-commits] [tabmixplus] 03/10: Follow up bug 1302737 - When closing tabs with non-mouse devices (e.g. touch, pen), don't enter locked-tab-size mode

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 75f9be15e1dad603eb4e4b1fed08b9cef45d37c7
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sun Oct 2 03:19:22 2016 +0300

    Follow up bug 1302737 - When closing tabs with non-mouse devices (e.g. touch, pen), don't enter locked-tab-size mode
---
 chrome/content/click/click.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index 6b6b3a5..d994e71 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -134,7 +134,7 @@ var TabmixTabClickOptions = {
     if (!pref) return; // just in case we missed something
     pref += clickOutTabs ? "ClickTabbar" : "ClickTab";
     var command = Tabmix.prefs.getIntPref(pref);
-    if (command > -1 && this.doCommand(command, aTab, clickOutTabs)) {
+    if (command > -1 && this.doCommand(command, aTab, clickOutTabs, event)) {
       event.stopPropagation();
       event.preventDefault();
     }
@@ -142,7 +142,7 @@ var TabmixTabClickOptions = {
 
 /// add option to open new tab after current one
 /// convert this switch to object
-  doCommand: function TMP_doCommand(command, aTab, clickOutTabs) {
+  doCommand: function TMP_doCommand(command, aTab, clickOutTabs, event) {
     gBrowser.selectedBrowser.focus();
     switch (command) {
       case 0 :
@@ -151,8 +151,10 @@ var TabmixTabClickOptions = {
         BrowserOpenTab();
         break;
       case 2 :
-        if (aTab && aTab.parentNode)
-          gBrowser.removeTab(aTab, {animate: true, byMouse: true});
+        if (aTab && aTab.parentNode) {
+          let byMouse = Tabmix.isVersion(520) ? event && event.mozInputSource == MouseEvent.MOZ_SOURCE_MOUSE : true;
+          gBrowser.removeTab(aTab, {animate: true, byMouse: byMouse});
+        }
         break;
       case 3 :
         gBrowser.duplicateTab(aTab);
@@ -255,7 +257,7 @@ var TabmixTabClickOptions = {
       case 29:
         // changed on 2011-03-09 - open new tab when clicked on tabbar
         // or when the tab is locked
-        var event = document.createEvent("Events");
+        event = document.createEvent("Events");
         var opennewTab = clickOutTabs || (aTab.hasAttribute("locked") && !gBrowser.isBlankNotBusyTab(aTab));
         event.ctrlKey = opennewTab;
         event.initEvent("click", true, true);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git