[Pkg-mozext-commits] [tabmixplus] 05/15: When 'Ctrl-Tab navigates tabs in the most recently used order' is off we may call gBrowser.mTabBox.handleEvent from keydown regressed by changeset 008c5cf91d02

[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 e8e8ae6e0af291efcc75983143bdf0f0062b62e6
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Jan 30 23:37:39 2015 +0200

    When 'Ctrl-Tab navigates tabs in the most recently used order' is off we may call gBrowser.mTabBox.handleEvent from keydown
    regressed by changeset 008c5cf91d02
---
 chrome/content/flst/lasttab.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/chrome/content/flst/lasttab.js b/chrome/content/flst/lasttab.js
index 158e7af..ff7a677 100644
--- a/chrome/content/flst/lasttab.js
+++ b/chrome/content/flst/lasttab.js
@@ -50,21 +50,21 @@ var TMP_LastTab = {
 
    init : function() {
       this._inited = true;
-      var browser = document.documentElement;
 
       this.TabList = document.getElementById("lasttabTabList");
 
       let tabBox = gBrowser.mTabBox;
+      let els = Cc["@mozilla.org/eventlistenerservice;1"]
+                    .getService(Ci.nsIEventListenerService);
       if (Tabmix.isVersion(320)) {
-        let els = Cc["@mozilla.org/eventlistenerservice;1"]
-                      .getService(Ci.nsIEventListenerService);
         els.removeSystemEventListener(tabBox._eventNode, "keydown", tabBox, false);
       }
-      else
+      else {
         tabBox._eventNode.removeEventListener("keypress", tabBox, false);
-      browser.addEventListener("keydown", this, true);
-      browser.addEventListener("keypress", this, true);
-      browser.addEventListener("keyup", this, true);
+        els.addSystemEventListener(tabBox._eventNode, "keypress", this, false);
+      }
+      els.addSystemEventListener(tabBox._eventNode, "keydown", this, false);
+      els.addSystemEventListener(tabBox._eventNode, "keyup", this, false);
 
       // if session manager select other tab then the first one we need to build
       // TabHistory in two steps to maintain natural Ctrl-Tab order.
@@ -81,10 +81,14 @@ var TMP_LastTab = {
    deinit : function() {
       if (!this._inited)
         return;
-      var browser = document.documentElement;
-      browser.removeEventListener("keydown", this, true);
-      browser.removeEventListener("keypress", this, true);
-      browser.removeEventListener("keyup", this, true);
+
+      let tabBox = gBrowser.mTabBox;
+      let els = Cc["@mozilla.org/eventlistenerservice;1"]
+                    .getService(Ci.nsIEventListenerService);
+      els.removeSystemEventListener(tabBox._eventNode, "keydown", this, false);
+      els.removeSystemEventListener(tabBox._eventNode, "keyup", this, false);
+      if (!Tabmix.isVersion(320))
+         els.removeSystemEventListener(tabBox._eventNode, "keypress", this, false);
    },
 
    handleEvent : function(event) {
@@ -155,8 +159,8 @@ var TMP_LastTab = {
    OnKeyDown : function(event) {
       this.CtrlKey = event.ctrlKey && !event.altKey && !event.metaKey;
       Tabmix.keyModifierDown = event.shiftKey || event.ctrlKey || event.altKey || event.metaKey;
-      if (Tabmix.isVersion(320) && !this.isCtrlTab(event))
-        gBrowser.mTabBox.handleEvent(event);
+      if (Tabmix.isVersion(320))
+         this.OnKeyPress(event);
    },
 
    set tabs (val) {

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