From 7c71359f2df2758ef36bad616e06dc96fe6cf2e0 Mon Sep 17 00:00:00 2001
From: SHIMODA Hiroshi <shimoda@clear-code.com>
Date: Wed, 25 May 2011 12:47:38 +0900
Subject: [PATCH] pref UI for middle click on the new tab button should be
 hidden on Firefox 3.6

---
 content/treestyletab/config.js       | 6 ++++++
 content/treestyletab/config.xul      | 2 +-
 content/treestyletab/treestyletab.js | 4 ++--
 defaults/preferences/treestyletab.js | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js
index 9a7ba41e..a97a9396 100644
--- a/content/treestyletab/config.js
+++ b/content/treestyletab/config.js
@@ -162,6 +162,12 @@ function initTabPane()
 		'openGroupBookmark-check',
 		'openGroupBookmark-deck'
 	);
+
+	var newTabPref = document.getElementById('extensions.treestyletab.autoAttach.newTabButton-box');
+	if (comparator.compare(XULAppInfo.version, '4.0') >= 0)
+		newTabPref.removeAttribute('hidden');
+	else
+		newTabPref.setAttribute('hidden', true);
 }
 
 function onSyncGroupBookmarkUIToPref()
diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 27c0fb2b..53d4f7fd 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -381,7 +381,7 @@
 		<label value="&config.autoAttach.newTabCommand.label_after;"
 			control="extensions.treestyletab.autoAttach.newTabCommand-menulist"/>
 	</hbox>
-	<hbox align="center">
+	<hbox align="center" id="extensions.treestyletab.autoAttach.newTabButton-box">
 		<label value="&config.autoAttach.newTabButton.label_before;"
 			control="extensions.treestyletab.autoAttach.newTabButton-menulist"/>
 		<menulist id="extensions.treestyletab.autoAttach.newTabButton-menulist"
diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index d2bdad71..1946ff37 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -785,7 +785,7 @@ var TreeStyleTabService = {
 		var tabbar = this.getTabStrip(this.browser);
 		tabbar.addEventListener('click', this, true);
 
-		var newTabButton = document.getElementById('new-tab-button'); // Firefox 4 or later
+		var newTabButton = document.getElementById('new-tab-button');
 		if (newTabButton &&
 			!(tabbar.compareDocumentPosition(newTabButton) & Ci.nsIDOM3Node.DOCUMENT_POSITION_CONTAINED_BY))
 			newTabButton.parentNode.addEventListener('click', this, true);
@@ -808,7 +808,7 @@ var TreeStyleTabService = {
 		var tabbar = this.getTabStrip(this.browser);
 		tabbar.removeEventListener('click', this, true);
 
-		var newTabButton = document.getElementById('new-tab-button'); // Firefox 4 or later
+		var newTabButton = document.getElementById('new-tab-button');
 		if (newTabButton &&
 			!(tabbar.compareDocumentPosition(newTabButton) & Ci.nsIDOM3Node.DOCUMENT_POSITION_CONTAINED_BY))
 			newTabButton.parentNode.removeEventListener('click', this, true);
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index 3e3566d3..496040ca 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -450,6 +450,8 @@ pref("extensions.treestyletab.autoAttach.newTabCommand", 0);
 /**
  * How to treat new tabs from middle click (or Ctrl-click) on the "New Tab" button.
  *  Options are same to extensions.treestyletab.autoAttach.newTabCommand.
+ * NOTE: This pref affects only on Firefox 4 or later. Firefox 3.6 doesn't open
+ *       new blank tabs by middle click on the "New Tab" button.
  */
 pref("extensions.treestyletab.autoAttach.newTabButton", 0);
 /**