From e9508cd29bdb0db8560d951bfc85a62bd76a61d7 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Wed, 27 Feb 2008 02:22:15 +0000
Subject: [PATCH] =?UTF-8?q?Firefox=203=E3=81=A7=E3=83=96=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=AF=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=97?=
 =?UTF-8?q?=E3=82=92=E3=82=BF=E3=83=96=E3=81=A7=E9=96=8B=E3=81=8F=E3=81=8B?=
 =?UTF-8?q?=E3=81=A9=E3=81=86=E3=81=8B=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=8C?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=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@1931 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/bookmarksOverlay.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/content/treestyletab/bookmarksOverlay.js b/content/treestyletab/bookmarksOverlay.js
index 1ed7bdb7..599236f9 100644
--- a/content/treestyletab/bookmarksOverlay.js
+++ b/content/treestyletab/bookmarksOverlay.js
@@ -38,9 +38,20 @@ window.addEventListener('load', function() {
 			PlacesUtils._openTabset.toSource().replace(
 				'browserWindow.getBrowser().loadTabs(',
 				<><![CDATA[
-					if (TreeStyleTabService.getTreePref('openGroupBookmarkAsTabSubTree') &&
-						where.indexOf('tab') == 0)
+					if (
+						TreeStyleTabService.getTreePref('openGroupBookmarkAsTabSubTree') &&
+						(
+							where.indexOf('tab') == 0 ||
+							aEvent.target.getAttribute('openInTabs') == 'true'
+						)
+						)
+						{
 						TreeStyleTabService.readyToOpenNewTabGroup();
+						replaceCurrentTab = false;
+					}
+					else if (!TreeStyleTabService.getPref('browser.tabs.loadFolderAndReplace')) {
+						replaceCurrentTab = false;
+					}
 					$&]]></>
 			)
 		);