Fix handling errors on local domains with custom port

barbushin · barbushin · commit bf0059fe3ed7 · 2016-04-05T18:43:20.000+08:00
diff --git a/background.js b/background.js
@@ -5,7 +5,7 @@
 }
 
 function getBaseHostByUrl(url) {
-	var localUrlRegexp = /(file:\/\/.*)|(:\/\/[^.:]+([\/?]|$))/; // file://
+	var localUrlRegexp = /(file:\/\/.*)|(:\/\/[^.:]+([\/?:]|$))/; // file:// | local
 	var rootHostRegexp = /:\/\/(([\w-]+\.\w+)|(\d+\.\d+\.\d+\.\d+)|(\[[\w:]+\]))([\/?:]|$)/; // domain.com | IPv4 | IPv6
 	var subDomainRegexp = /:\/\/[^\/]*\.([\w-]+\.\w+)([\/?:]|$)/; // sub.domain.com
 	return localUrlRegexp.exec(url) ? 'localhost' : (rootHostRegexp.exec(url) || subDomainRegexp.exec(url))[1];

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`function getBaseHostByUrl(url) {`
`8`		`- var localUrlRegexp = /(file:\/\/.*)\|(:\/\/[^.:]+([\/?]\|$))/; // file://`
	`8`	`+ var localUrlRegexp = /(file:\/\/.*)\|(:\/\/[^.:]+([\/?:]\|$))/; // file:// \| local`
`9`	`9`	`var rootHostRegexp = /:\/\/(([\w-]+\.\w+)\|(\d+\.\d+\.\d+\.\d+)\|(\[[\w:]+\]))([\/?:]\|$)/; // domain.com \| IPv4 \| IPv6`
`10`	`10`	`var subDomainRegexp = /:\/\/[^\/]*\.([\w-]+\.\w+)([\/?:]\|$)/; // sub.domain.com`
`11`	`11`	`return localUrlRegexp.exec(url) ? 'localhost' : (rootHostRegexp.exec(url) \|\| subDomainRegexp.exec(url))[1];`