[Pkg-mozext-commits] [tabmixplus] 02/10: Incompatibility with Tab Deque extension, other tabs can't be selected and will quickly revert to the current one. Use the default mousedown event when we don't prevent the default behavior

Tue Dec 29 19:03:19 UTC 2015

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

taffit pushed a commit to tag 0.4.2.1pre.151226a1
in repository tabmixplus.

commit 2ccdfed8f45420b63418d4619afe15c4632cae6b
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sun Dec 20 21:08:55 2015 +0200

    Incompatibility with Tab Deque extension, other tabs can't be selected and will quickly revert to the current one.
    Use the default mousedown event when we don't prevent the default behavior
---
 chrome/content/click/click.js       | 2 +-
 chrome/content/tab/tabbrowser_4.xml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index f08b0cb..c0e8878 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -53,7 +53,7 @@ var TabmixTabClickOptions = {
     // always call onMouseCommand (if we need to) before we call tab flip.
     // tabcontainer click handler run before tab click handler.
     if (leftClick && !clickOutTabs && !tab.mouseDownSelect)
-      tab.onMouseCommand(aEvent);
+      tab.onMouseCommand(aEvent, true);
 
     // for tab flip
     if (!clickOutTabs && leftClick && tab.hasAttribute("clickOnCurrent")) {
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 3e42a8c..17a80fe 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -281,6 +281,7 @@
 
     <method name="onMouseCommand">
       <parameter name="aEvent"/>
+      <parameter name="aSelectNewTab"/>
       <body><![CDATA[
         var isSelected = this == this.parentNode.selectedItem;
         Tabmix.setItem(this, "clickOnCurrent",
@@ -291,7 +292,7 @@
         // don't allow mouse click/down with modifiers to select tab
         if (aEvent.shiftKey || aEvent.ctrlKey || aEvent.altKey || aEvent.metaKey)
           aEvent.stopPropagation();
-        else {
+        else if (aSelectNewTab) {
           this.parentNode._selectNewTab(this);
           let isTabFocused = false;
           try {
@@ -302,6 +303,7 @@
             this.mSelect = setTimeout(function (tab) tab.removeAttribute("ignorefocus"), 0, this);
           }
         }
+        // on mousedown event fall through to default mousedown from tabbox.xml
       ]]></body>
     </method>
 

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

