new build

alexcorvi · May 8, 2020 · ec63993 · ec63993
1 parent ee804fe
commit ec63993
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 35 deletions.
diff --git a/dist/browser/anchorme.js b/dist/browser/anchorme.js
@@ -161,7 +161,6 @@
 	exports.emailRegex = new RegExp("^(" + exports.email + ")$", "i");
 	exports.fileRegex = new RegExp("^(" + exports.file + ")$", "i");
 	exports.urlRegex = new RegExp("^(" + exports.url + ")$", "i");
-	exports.protocolPresent = /^((file:\/\/\/)|(https?:|ftps?:)\/\/|(mailto:))/i;
 	// identifying parts of the link
 	var iidxes = {
 	    isURL: 0,
@@ -254,8 +253,7 @@
 	var regex_6 = regex.emailRegex;
 	var regex_7 = regex.fileRegex;
 	var regex_8 = regex.urlRegex;
-	var regex_9 = regex.protocolPresent;
-	var regex_10 = regex.iidxes;
+	var regex_9 = regex.iidxes;
 
 	var utils = createCommonjsModule(function (module, exports) {
 	Object.defineProperty(exports, "__esModule", { value: true });
@@ -271,17 +269,9 @@
 	}
 	exports.checkParenthesis = checkParenthesis;
 	exports.maximumAttrLength = dictionary.htmlAttributes.sort(function (a, b) { return b.length - a.length; })[0].length;
-	function isInsideAttribute(quoteType, prevFragment) {
-	    for (var index = 0; index < dictionary.htmlAttributes.length; index++) {
-	        var atr = dictionary.htmlAttributes[index];
-	        var targetString = atr.toLowerCase() + "=" + quoteType;
-	        if (prevFragment.toLowerCase().indexOf(targetString) !== -1 &&
-	            prevFragment.toLowerCase().indexOf(targetString) ===
-	                prevFragment.length - targetString.length) {
-	            return true;
-	        }
-	    }
-	    return false;
+	function isInsideAttribute(prevFragment) {
+	    return (/\s[a-z0-9-]+=('|")$/i.test(prevFragment) ||
+	        /: ?url\(('|")?$/i.test(prevFragment));
 	}
 	exports.isInsideAttribute = isInsideAttribute;
 	function isInsideAnchorTag(target, fullInput, targetEnd) {
@@ -353,9 +343,8 @@
 	                checking whether the token is already inside an HTML element by seeing if it's
 	                preceded by an HTML attribute that would hold a url (e.g. scr, cite ...etc)
 	            */
-	        if (input.charAt(start - 1) === "'" ||
-	            input.charAt(start - 1) === '"') {
-	            if (utils.isInsideAttribute(input.charAt(start - 1), input.substring(start - utils.maximumAttrLength - 5, start))) {
+	        if (['""', "''", "()"].indexOf(input.charAt(start - 1) + input.charAt(end)) !== -1) {
+	            if (utils.isInsideAttribute(input.substring(start - utils.maximumAttrLength - 15, start))) {
 	                return "continue";
 	            }
 	        }

diff --git a/dist/browser/anchorme.min.js b/dist/browser/anchorme.min.js
diff --git a/dist/node/index.js b/dist/node/index.js
@@ -46,9 +46,8 @@ var list = function (input) {
                 checking whether the token is already inside an HTML element by seeing if it's
                 preceded by an HTML attribute that would hold a url (e.g. scr, cite ...etc)
             */
-        if (input.charAt(start - 1) === "'" ||
-            input.charAt(start - 1) === '"') {
-            if (utils_1.isInsideAttribute(input.charAt(start - 1), input.substring(start - utils_1.maximumAttrLength - 5, start))) {
+        if (['""', "''", "()"].indexOf(input.charAt(start - 1) + input.charAt(end)) !== -1) {
+            if (utils_1.isInsideAttribute(input.substring(start - utils_1.maximumAttrLength - 15, start))) {
                 return "continue";
             }
         }

diff --git a/dist/node/regex.d.ts b/dist/node/regex.d.ts
@@ -7,7 +7,6 @@ export declare const ipRegex: RegExp;
 export declare const emailRegex: RegExp;
 export declare const fileRegex: RegExp;
 export declare const urlRegex: RegExp;
-export declare const protocolPresent: RegExp;
 declare const iidxes: {
     isURL: number;
     isEmail: number;

diff --git a/dist/node/regex.js b/dist/node/regex.js
@@ -24,7 +24,6 @@ exports.ipRegex = new RegExp("^(" + ipv4 + "|" + ipv6 + ")$", "i");
 exports.emailRegex = new RegExp("^(" + exports.email + ")$", "i");
 exports.fileRegex = new RegExp("^(" + exports.file + ")$", "i");
 exports.urlRegex = new RegExp("^(" + exports.url + ")$", "i");
-exports.protocolPresent = /^((file:\/\/\/)|(https?:|ftps?:)\/\/|(mailto:))/i;
 // identifying parts of the link
 var iidxes = {
     isURL: 0,

diff --git a/dist/node/utils.d.ts b/dist/node/utils.d.ts
@@ -1,4 +1,4 @@
 export declare function checkParenthesis(opening: string, closing: string, target: string, nextChar: string): boolean | undefined;
 export declare const maximumAttrLength: number;
-export declare function isInsideAttribute(quoteType: string, prevFragment: string): boolean;
+export declare function isInsideAttribute(prevFragment: string): boolean;
 export declare function isInsideAnchorTag(target: string, fullInput: string, targetEnd: number): boolean;
diff --git a/dist/node/utils.js b/dist/node/utils.js
@@ -12,17 +12,9 @@ function checkParenthesis(opening, closing, target, nextChar) {
 }
 exports.checkParenthesis = checkParenthesis;
 exports.maximumAttrLength = dictionary_1.htmlAttributes.sort(function (a, b) { return b.length - a.length; })[0].length;
-function isInsideAttribute(quoteType, prevFragment) {
-    for (var index = 0; index < dictionary_1.htmlAttributes.length; index++) {
-        var atr = dictionary_1.htmlAttributes[index];
-        var targetString = atr.toLowerCase() + "=" + quoteType;
-        if (prevFragment.toLowerCase().indexOf(targetString) !== -1 &&
-            prevFragment.toLowerCase().indexOf(targetString) ===
-                prevFragment.length - targetString.length) {
-            return true;
-        }
-    }
-    return false;
+function isInsideAttribute(prevFragment) {
+    return (/\s[a-z0-9-]+=('|")$/i.test(prevFragment) ||
+        /: ?url\(('|")?$/i.test(prevFragment));
 }
 exports.isInsideAttribute = isInsideAttribute;
 function isInsideAnchorTag(target, fullInput, targetEnd) {