make simpler regex for detecting prefix

afeld · afeld · commit 29f7d195b794 · 2014-01-02T03:47:34.000-05:00
diff --git a/Autolinker.js b/Autolinker.js
@@ -36,11 +36,11 @@ var Autolinker = {
 
 	/**
 	 * @private
-	 * @property {RegExp} httpRegex
+	 * @property {RegExp} prefixRegex
 	 * 
 	 * A regular expression used to remove the 'http://' or 'https://' and/or the 'www.' from URLs.
 	 */
-	httpRegex: /(https?:\/\/)?(www\.)?/g,
+	prefixRegex: /^(https?:\/\/)?(www\.)?/,
 	
 	
 	/**
@@ -109,7 +109,7 @@ var Autolinker = {
 				}
 
 				if ( stripPrefix ) {
-					anchorText = anchorText.replace( Autolinker.httpRegex, '' );
+					anchorText = anchorText.replace( Autolinker.prefixRegex, '' );
 				}
 				
 				// Set the attributes for the anchor tag
diff --git a/Autolinker.min.js b/Autolinker.min.js
diff --git a/src/Autolinker.js b/src/Autolinker.js
@@ -27,11 +27,11 @@ var Autolinker = {
 
 	/**
 	 * @private
-	 * @property {RegExp} httpRegex
+	 * @property {RegExp} prefixRegex
 	 * 
 	 * A regular expression used to remove the 'http://' or 'https://' and/or the 'www.' from URLs.
 	 */
-	httpRegex: /(https?:\/\/)?(www\.)?/g,
+	prefixRegex: /^(https?:\/\/)?(www\.)?/,
 	
 	
 	/**
@@ -100,7 +100,7 @@ var Autolinker = {
 				}
 
 				if ( stripPrefix ) {
-					anchorText = anchorText.replace( Autolinker.httpRegex, '' );
+					anchorText = anchorText.replace( Autolinker.prefixRegex, '' );
 				}
 				
 				// Set the attributes for the anchor tag

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,11 @@ var Autolinker = {`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* @private`
`39`		`- * @property {RegExp} httpRegex`
	`39`	`+ * @property {RegExp} prefixRegex`
`40`	`40`	`*`
`41`	`41`	`* A regular expression used to remove the 'http://' or 'https://' and/or the 'www.' from URLs.`
`42`	`42`	`*/`
`43`		`- httpRegex: /(https?:\/\/)?(www\.)?/g,`
	`43`	`+ prefixRegex: /^(https?:\/\/)?(www\.)?/,`
`44`	`44`
`45`	`45`
`46`	`46`	`/**`
`@@ -109,7 +109,7 @@ var Autolinker = {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`if ( stripPrefix ) {`
`112`		`- anchorText = anchorText.replace( Autolinker.httpRegex, '' );`
	`112`	`+ anchorText = anchorText.replace( Autolinker.prefixRegex, '' );`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// Set the attributes for the anchor tag`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ var Autolinker = {`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @private`
`30`		`- * @property {RegExp} httpRegex`
	`30`	`+ * @property {RegExp} prefixRegex`
`31`	`31`	`*`
`32`	`32`	`* A regular expression used to remove the 'http://' or 'https://' and/or the 'www.' from URLs.`
`33`	`33`	`*/`
`34`		`- httpRegex: /(https?:\/\/)?(www\.)?/g,`
	`34`	`+ prefixRegex: /^(https?:\/\/)?(www\.)?/,`
`35`	`35`
`36`	`36`
`37`	`37`	`/**`
`@@ -100,7 +100,7 @@ var Autolinker = {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if ( stripPrefix ) {`
`103`		`- anchorText = anchorText.replace( Autolinker.httpRegex, '' );`
	`103`	`+ anchorText = anchorText.replace( Autolinker.prefixRegex, '' );`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Set the attributes for the anchor tag`