From a2dd650e44d89117f96c4e6cd7fff46d17f67e94 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Mon, 4 Jan 2010 01:19:56 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=AB=E3=83=81=E3=83=97=E3=83=AB?=
 =?UTF-8?q?=E3=82=BF=E3=83=96=E3=83=8F=E3=83=B3=E3=83=89=E3=83=A9=E5=81=B4?=
 =?UTF-8?q?=E3=81=AEAPI=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E3=83=A1?=
 =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=83=BB?=
 =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=82=92=E5=88=87=E3=82=8A=E6=9B=BF?=
 =?UTF-8?q?=E3=81=88=E3=82=8B=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@5688 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/hacks.js         | 14 --------------
 content/treestyletab/treestyletab.xul |  6 ++++--
 modules/utils.js                      |  2 --
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index 542fe24c..0ff38c95 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -306,20 +306,6 @@ TreeStyleTabService.overrideExtensionsOnInitBefore = function TSTService_overrid
 
 TreeStyleTabService.overrideExtensionsOnInitAfter = function TSTService_overrideExtensionsOnInitAfter() {
 
-	// Multiple Tab Handler
-	if ('MultipleTabService' in window) {
-		eval('MultipleTabService.showHideMenuItems = '+
-			MultipleTabService.showHideMenuItems.toSource().replace(
-				'var separators = ',
-				<![CDATA[
-					if (aPopup.id == 'multipletab-selection-menu') {
-						TreeStyleTabService.showHideSubtreeMenuItem(document.getElementById(TreeStyleTabService.kMENUITEM_REMOVESUBTREE_SELECTION), MultipleTabService.getSelectedTabs());
-					}
-					$&]]>
-			)
-		);
-	}
-
 	// Selection Links
 	// https://addons.mozilla.org/firefox/addon/8644
 	if ('selectionlinks' in window &&
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 00e22739..46939bed 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -37,18 +37,20 @@
 ]]></script>
 
 
+<!-- Multiple Tab Handler -->
 <menupopup id="multipletab-selection-menu">
 	<menuitem id="multipletab-selection-item-removeTabSubtree"
 		insertafter="multipletab-selection-removeTabs"
 		label="&selection.removeTabSubtree.label;"
 		accesskey="&selection.removeTabSubtree.accesskey;"
-		oncommand="TreeStyleTabService.removeTabSubtree(MultipleTabService.getSelectedTabs());"/>
+		oncommand="TreeStyleTabService.removeTabSubtree(MultipleTabService.getSelectedTabs());"
+		multipletab-available="selectedTabs.length"/>
 	<menuitem id="multipletab-selection-item-createSubtree"
 		insertafter="multipletab-selection-splitWindow"
 		label="&selection.createSubtree.label;"
 		accesskey="&selection.createSubtree.accesskey;"
 		oncommand="TreeStyleTabService.createSubtree(MultipleTabService.getSelectedTabs());"
-		multipletab-enabled="TreeStyleTabService.canCreateSubtree(MultipleTabService.getSelectedTabs())"/>
+		multipletab-enabled="TreeStyleTabService.canCreateSubtree(selectedTabs)"/>
 </menupopup>
 
 <popupset id="mainPopupSet">
diff --git a/modules/utils.js b/modules/utils.js
index 76e909e8..503e30a3 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -107,8 +107,6 @@ var TreeStyleTabUtils = {
 	kCOUNTER_CONTAINER     : 'treestyletab-counter-container',
 	kSPLITTER              : 'treestyletab-splitter',
 	kTABBAR_TOGGLER        : 'treestyletab-tabbar-toggler',
-
-	kMENUITEM_REMOVESUBTREE_SELECTION : 'multipletab-selection-item-removeTabSubtree',
  
 /* other constant values */ 
 	kFOCUS_ALL     : 0,