From 381207f5b572267b5734fcaa7c5d8c3bc1680d2f Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Fri, 26 Oct 2007 19:42:46 +0000
Subject: [PATCH] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E3=81=AE=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=8Cabout:blank=E3=81=AA=E3=81=A9=E3=81=AE?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA?=
 =?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
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@1350 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletab.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index 07e06997..5185b28b 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -760,8 +760,11 @@ catch(e) {
 				'{',
 				<><![CDATA[
 					{
-						var currentURI = TreeStyleTabService.browser.currentURI;
-						var parentTab  = TreeStyleTabService.getParentTab(TreeStyleTabService.browser.selectedTab);
+						var currentURI  = TreeStyleTabService.browser.currentURI;
+						var currentHost = currentURI.spec.match(/^\w+:\/\/[^:\/]+(\/|$)/) ? currentURI.host : null ;
+						var parentTab   = TreeStyleTabService.getParentTab(TreeStyleTabService.browser.selectedTab);
+						var parentURI   = parentTab ? parentTab.linkedBrowser.currentURI : null ;
+						var parentHost  = parentURI && parentURI.spec.match(/^\w+:\/\/[^:\/]+(\/|$)/) ? parentURI.host : null ;
 				]]></>
 			).replace(
 				'aTriggeringEvent && aTriggeringEvent.altKey',
@@ -772,16 +775,17 @@ catch(e) {
 						(
 							(
 								TreeStyleTabService.getTreePref('urlbar.loadSameDomainToNewChildTab') &&
-								currentURI.host == RegExp.$1 &&
+								currentHost == RegExp.$1 &&
 								(TreeStyleTabService.readyToOpenChildTab(
-									parentTab && parentTab.linkedBrowser.currentURI.host == RegExp.$1 ?
+									parentHost == RegExp.$1 ?
 										parentTab :
 										null
 								), true)
 							) ||
 							(
 								TreeStyleTabService.getTreePref('urlbar.loadSameDomainToNewChildTab') &&
-								currentURI.host != RegExp.$1
+								currentHost != RegExp.$1 &&
+								currentURI.spec != 'about:blank'
 							)
 						)
 					)