eslint fixes

vue-generators · Jun 30, 2017 · 11763e3 · 11763e3
1 parent 181aa06
commit 11763e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/utils/schema.js b/src/utils/schema.js
@@ -63,19 +63,18 @@ module.exports.slugifyFormID = function(schema, prefix = "") {
 	} else {
 		// Return the slugified version of either:
 		return prefix + (schema.inputName || schema.label || schema.model)
-		// NB: This is a very simple, conservative, slugify function,
-		// avoiding extra dependencies.
-		.toString()
-		.trim()
-		.toLowerCase()
-		// Spaces & underscores to dashes
-		.replace(/ |_/g, "-")
-		// Multiple dashes to one
-		.replace(/-{2,}/g, "-")
-		// Remove leading & trailing dashes
-		.replace(/^-+|-+$/g, "")
-		// Remove anything that isn't a (English/ASCII) letter, number or dash.
-		.replace(/([^a-zA-Z0-9-]+)/g, "")
-		;
+			// NB: This is a very simple, conservative, slugify function,
+			// avoiding extra dependencies.
+			.toString()
+			.trim()
+			.toLowerCase()
+			// Spaces & underscores to dashes
+			.replace(/ |_/g, "-")
+			// Multiple dashes to one
+			.replace(/-{2,}/g, "-")
+			// Remove leading & trailing dashes
+			.replace(/^-+|-+$/g, "")
+			// Remove anything that isn't a (English/ASCII) letter, number or dash.
+			.replace(/([^a-zA-Z0-9-]+)/g, "");
 	}
 };
diff --git a/src/utils/validators.js b/src/utils/validators.js
@@ -165,15 +165,15 @@ module.exports = {
 	email(value, field, model, messages = resources) {
 		let res = checkEmpty(value, field.required, messages); if (res != null) return res;
 
-		let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+		let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; // eslint-disable-line no-useless-escape
 		if (!re.test(value))
 			return [msg(messages.invalidEmail)];
 	},	
 
 	url(value, field, model, messages = resources) {
 		let res = checkEmpty(value, field.required, messages); if (res != null) return res;
 
-		let re = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
+		let re = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g; // eslint-disable-line no-useless-escape
 		if (!re.test(value))
 			return [msg(messages.invalidURL)];
 	},