[validate] Remove hasProtocol parameter, add short-circuit checks

Author: fcmod

src/linkify-element.js

@@ -32,9 +32,7 @@ function tokensToNodes(tokens, opts, doc) {
 
 	for (let i = 0; i < tokens.length; i++) {
 		let token = tokens[i];
-		let validated = options.resolve(opts.validate,
-			token.hasProtocol ? token.hasProtocol() : false,
-			token.toString(), token.type);
+		let validated = token.isLink && options.resolve(opts.validate, token.toString(), token.type);
 
 		if (token.isLink && validated) {
 

src/linkify-html.js

@@ -77,9 +77,7 @@ function linkifyChars(str, opts) {
 
 	for (var i = 0; i < tokens.length; i++) {
 		let token = tokens[i];
-		let validated = linkify.options.resolve(opts.validate,
-							token.hasProtocol ? token.hasProtocol() : false,
-							token.toString(), token.type);
+		let validated = token.isLink && linkify.options.resolve(opts.validate, token.toString(), token.type);
 
 		if (token.type === 'nl' && opts.nl2br) {
 			result.push({

src/linkify-string.js

@@ -37,9 +37,7 @@ function linkifyStr(str, opts={}) {
 
 	for (let i = 0; i < tokens.length; i++) {
 		let token = tokens[i];
-		let validated = options.resolve(opts.validate,
-			token.hasProtocol ? token.hasProtocol() : false,
-			token.toString(), token.type);
+		let validated = token.isLink && options.resolve(opts.validate, token.toString(), token.type);
 
 		if (token.isLink && validated) {
 

test/spec/html/options.js

@@ -33,8 +33,8 @@ module.exports = {
 	},
 
 	validateOptions: {
-		validate: function (hasProtocol, text, type) {
-			return type === 'email' || (hasProtocol || text.slice(0,3) === 'www');
+		validate: function (text, type) {
+			return type !== 'url' || /^(http|ftp)s?:\/\//.test(text) || text.slice(0,3) === 'www';
 		}
 	}
 };

test/spec/linkify-html-test.js

@@ -65,13 +65,13 @@ describe('linkify-html', function () {
 	});
 
 	it('Works with overriden options (validate)', function () {
-		var options_validate = {
-			validate: function (hasProtocol, text, type) {
-				return type === 'email' || (hasProtocol || text.slice(0,3) === 'www');
+		var optionsValidate = {
+			validate: function (text, type) {
+				return type !== 'url' || /^(http|ftp)s?:\/\//.test(text) || text.slice(0,3) === 'www';
 			}
 		},
 
-		tests_validate = [
+		testsValidate = [
 			[
 				'1.Test with no links',
 				'1.Test with no links'
@@ -93,8 +93,8 @@ describe('linkify-html', function () {
 			]
 		];
 
-		tests_validate.map(function (test) {
-			expect(linkifyHtml(test[0], options_validate)).to.be.eql(test[1]);
+		testsValidate.map(function (test) {
+			expect(linkifyHtml(test[0], optionsValidate)).to.be.eql(test[1]);
 		});
 	});
 

test/spec/linkify-string-test.js

@@ -80,13 +80,13 @@ describe('linkify-string', function () {
 
 	// Test specific options
 	it('Works with overriden options (validate)', function () {
-		var options_validate = {
-			validate: function (hasProtocol, text, type) {
-				return type === 'email' || (hasProtocol || text.slice(0,3) === 'www');
+		var optionsValidate = {
+			validate: function (text, type) {
+				return type !== 'url' || /^(http|ftp)s?:\/\//.test(text) || text.slice(0,3) === 'www';
 			}
 		},
 
-		tests_validate = [
+		testsValidate = [
 			[
 				'1.Test with no links',
 				'1.Test with no links'
@@ -108,8 +108,8 @@ describe('linkify-string', function () {
 			]
 		];
 
-		tests_validate.map(function (test) {
-			expect(linkifyStr(test[0], options_validate)).to.be.eql(test[1]);
+		testsValidate.map(function (test) {
+			expect(linkifyStr(test[0], optionsValidate)).to.be.eql(test[1]);
 		});
 	});
 });