From 69852a60b6b3269a97c6c09d954963f3e5763a1b Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Thu, 8 Apr 2010 23:24:02 +0000
Subject: [PATCH] =?UTF-8?q?*=20=E3=82=BF=E3=83=96=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E4=B8=8A=E3=81=A7=E3=81=AE=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E3=82=92=E3=82=AD=E3=83=A3=E3=83=97=E3=83=81?=
 =?UTF-8?q?=E3=83=A3=E3=83=AA=E3=83=B3=E3=82=B0=E3=83=95=E3=82=A7=E3=82=A4?=
 =?UTF-8?q?=E3=82=BA=E3=81=A7=E7=9B=A3=E8=A6=96=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=20*=20twisty/=E3=82=BF?=
 =?UTF-8?q?=E3=83=96=E3=83=90=E3=83=BC=E3=81=AE=E3=82=B9=E3=83=97=E3=83=AA?=
 =?UTF-8?q?=E3=83=83=E3=82=BF/=E3=82=BF=E3=83=96=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E4=BD=99=E7=99=BD=E3=81=A7=E3=81=AE=E3=82=AF=E3=83=AA?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E6=93=8D=E4=BD=9C=E3=81=AB=E3=81=A4=E3=81=84?=
 =?UTF-8?q?=E3=81=A6=E3=80=81Ctrl-=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=82=84=E3=83=9F=E3=83=89=E3=83=AB=E3=82=AF=E3=83=AA=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=81=AE=E6=99=82=E3=81=AF=E5=8F=8D=E5=BF=9C=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@6589 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletabbrowser.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 6c5419f4..a332b36d 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -226,7 +226,7 @@ TreeStyleTabBrowser.prototype = {
 		strip.addEventListener('dragdrop',    this, false);
 		strip.addEventListener('mousedown', this, true);
 		strip.addEventListener('mouseup',   this, false);
-		strip.addEventListener('click',     this, false);
+		strip.addEventListener('click',     this, true);
 		b.mPanelContainer.addEventListener('dragexit', this, false);
 		b.mPanelContainer.addEventListener('dragover', this, false);
 		b.mPanelContainer.addEventListener('dragdrop', this, false);
@@ -1340,7 +1340,7 @@ TreeStyleTabBrowser.prototype = {
 		strip.removeEventListener('dragdrop',    this, false);
 		strip.removeEventListener('mousedown', this, true);
 		strip.removeEventListener('mouseup',   this, false);
-		strip.removeEventListener('click',     this, false);
+		strip.removeEventListener('click',     this, true);
 		b.mPanelContainer.removeEventListener('dragexit', this, false);
 		b.mPanelContainer.removeEventListener('dragover', this, false);
 		b.mPanelContainer.removeEventListener('dragdrop', this, false);
@@ -2631,7 +2631,11 @@ TreeStyleTabBrowser.prototype = {
  
 	onClick : function TSTBrowser_onClick(aEvent) 
 	{
-		if (aEvent.target.ownerDocument != document)
+		if (
+			aEvent.target.ownerDocument != document
+			aEvent.button != 0 ||
+			this.isAccelKeyPressed(aEvent)
+			)
 			return;
 
 		var tab = this.getTabFromEvent(aEvent);