Skip to content
This repository has been archived by the owner on Aug 15, 2019. It is now read-only.

Commit

Permalink
moved everything into Grunt
Browse files Browse the repository at this point in the history
  • Loading branch information
jackfranklin committed Nov 4, 2012
1 parent 6de4b6c commit 75a0770
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
34 changes: 17 additions & 17 deletions src/jquery.formvalidator.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
(function($) {
$.fn.getAttributes = function() {
var attributes = {};
if(!this.length) return this;
if(!this.length) { return this; }
$.each(this[0].attributes, function(index, attr) {
attributes[attr.name] = attr.value;
});
return attributes;
}
};
})(jQuery);

(function(window) {
Expand All @@ -28,9 +28,9 @@
// lets fields be passed in on init

var init = function(fields) {
fields && addFields(fields);
if(fields) { addFields(fields); }
return this;
}
};
// store all fields in an object
var formFields = {};

Expand All @@ -39,14 +39,14 @@
formFields[attrs.name] = {
html: $(field),
attributes: attrs
}
}
};
};

var addFields = function(fields) {
for(var i = 0; i < fields.length; i++) {
addField(fields[i]);
};
}
}
};

//returns the object for a form element, based off its name attribute
var field = function(name) {
Expand All @@ -59,13 +59,13 @@
var validateField = function(name, validations) {
var field = formFields[name];
var fieldValue = field.html.val();
if (!field) return false //if we dont have a field then just exit out of this one
if (!field) { return false; } //if we dont have a field then just exit out of this one

var errorMessages = [];
for(var validation in validations) {
var method = validationMethods[validation];
var params = validations[validation];
if(!method) throw new Error("Validation method " + validation + " does not exist");
if(!method) { throw new Error("Validation method " + validation + " does not exist"); }
if(!method.fn(fieldValue, params, field.html)) {
errorMessages.push(replacePlaceholdersInMessage(method.message, { name: name, params: params }));
}
Expand Down Expand Up @@ -99,7 +99,7 @@
// method to return pending validations
var getPendingValidations = function() {
return pendingValidations;
}
};

//method for stacking validations
var addValidation = function(fieldName, validations) {
Expand All @@ -115,7 +115,7 @@


//method for clearing pending validations
var clearPendingValidations = function() { pendingValidations = {} };
var clearPendingValidations = function() { pendingValidations = {}; };


//method for running validations
Expand All @@ -125,7 +125,7 @@

var response = { valid: true, messages: [] };

for(field in pendingValidations) {
for(var field in pendingValidations) {
//validate the field
var resp = validateField(field, pendingValidations[field]);
var respMessagesLen = resp.messages.length;
Expand All @@ -134,7 +134,7 @@
response.messages.push(resp.messages[i]);
}
}
if(!resp.valid) response.valid = false;
if(!resp.valid) { response.valid = false; }
}

if(clearAfter) { clearPendingValidations(); }
Expand All @@ -154,7 +154,7 @@
message: "Field %F must be at least length %ARG",
fn: function(val, arg) {
return val.length >= arg;
},
}
},
max_length: {
message: "Field %F must be a maximum of %ARG characters",
Expand All @@ -165,7 +165,7 @@
required: {
message: "Field %F is required",
fn: function(val) {
return val != "";
return val !== "";
}
},
//this takes two arguments, the min and max length, so the arguments here are an array.
Expand All @@ -179,7 +179,7 @@
matches: {
message: "Field %F must match %ARG",
fn: function(val, arg) {
return val == arg;
return val === arg;
}
}
};
Expand Down
1 change: 0 additions & 1 deletion test/spec/formvalidatorSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ describe("jQuery Form Validator", function() {
it("can add validations for same field multiple times", function() {
validationTest.addValidation("username", { exact_length: 5 });
validationTest.addValidation("username", { matches: "jackf" });
console.log(validationTest.getPendingValidations());

// check that its valid
$(validationTest.field("username").html).val("jackf");
Expand Down

0 comments on commit 75a0770

Please sign in to comment.