Skip to content

2018 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# jQuery Form Validator

jQuery Form Validator is a **feature rich and multilingual** jQuery plugin that makes it easy to validate user input while keeping your HTML markup clean from javascript code. Even though this plugin has a wide range of validation functions it's **designed to require as little network traffic as possible**. This is achieved by grouping together validation functions in "modules", making it possible to load only those functions that's needed to validate a particular form.
jQuery Form Validator is a **feature rich and multilingual** jQuery plugin that makes it easy to validate user input while keeping your HTML markup clean from javascript code. This plugin approaches validation as a form of configuration that should'nt require any knowledge of JavaScript nor programming.

**Form demos and full documentation available at http://formvalidator.net/**

[![Travis](https://travis-ci.org/victorjonsson/PHP-Markdown-Documentation-Generator.svg)](https://travis-ci.org/victorjonsson/jQuery-Form-Validator/builds/)
[![Travis](https://travis-ci.org/victorjonsson/jQuery-Form-Validator.svg)](https://travis-ci.org/victorjonsson/jQuery-Form-Validator/builds/)

[![npm version](https://badge.fury.io/js/jquery-form-validator.svg)](https://www.npmjs.com/package/jquery-form-validator)

Expand Down
4 changes: 4 additions & 0 deletions src/main/jquery-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
* * @return {jQuery}
*/
$.fn.validateOnEvent = function (language, config) {
if(this.length === 0) {
return;
}

var $elements = this[0].nodeName === 'FORM' ? this.find('*[data-validation-event]') : this;
$elements
.each(function () {
Expand Down
13 changes: 13 additions & 0 deletions src/main/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
*/
validators: {},

/**
* Available sanitizers
*/
sanitizers: {},

/**
* Events triggered by form validator
*/
Expand All @@ -72,6 +77,14 @@
this.validators[name] = validator;
},

/**
* Function for adding a sanitizer
* @param {Object} sanitizer
*/
addSanitizer: function (sanitizer) {
this.sanitizers[sanitizer.name] = sanitizer;
},

/**
* Warn user via the console if available
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @return {Array}
*/
_getTypes = function($input) {
var allowedTypes = $.split( ($input.valAttr('allowing') || '').toLowerCase() );
var allowedTypes = ($input.valAttr('allowing') || '').toLowerCase().split(/,\s*/);
if ($.inArray('jpg', allowedTypes) > -1 && $.inArray('jpeg', allowedTypes) === -1) {
allowedTypes.push('jpeg');
}
Expand Down
176 changes: 113 additions & 63 deletions src/modules/sanitize.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,70 +28,112 @@

'use strict';

$.formUtils.registerLoadedModule('sanitize');

var inputsThatCantBeSanitized = '[type="button"], [type="submit"], [type="radio"], [type="checkbox"], [type="reset"], [type="search"]',
sanitizeCommands = {
upper : function(val) {
return val.toLocaleUpperCase();
},
lower : function(val) {
return val.toLocaleLowerCase();
},
trim : function(val) {
return $.trim(val);
},
trimLeft : function(val) {
return val.replace(/^\s+/,'');
},
trimRight : function(val) {
return val.replace(/\s+$/,'');
},
capitalize : function(val) {
var words = val.split(' ');
$.formUtils.addSanitizer({
name : 'upper',
sanitizerFunction : function(val) {
return val.toLocaleUpperCase();
}
});

$.formUtils.addSanitizer({
name : 'lower',
sanitizerFunction : function(val) {
return val.toLocaleLowerCase();
}
});

$.formUtils.addSanitizer({
name : 'trim',
sanitizerFunction : function(val) {
return $.trim(val);
}
});

$.formUtils.addSanitizer({
name : 'trimLeft',
sanitizerFunction : function(val) {
return val.replace(/^\s+/,'');
}
});

$.formUtils.addSanitizer({
name : 'trimRight',
sanitizerFunction : function(val) {
return val.replace(/\s+$/,'');
}
});

$.formUtils.addSanitizer({
name : 'capitalize',
sanitizerFunction : function(val) {
var words = val.split(' ');
$.each(words, function(i, word) {
words[i] = word.substr(0,1).toUpperCase() + word.substr(1, word.length);
});
return words.join(' ');
},
insert : function(val, $input, pos) {
}
});

$.formUtils.addSanitizer({
name : 'insert',
sanitizerFunction : function(val, $input, pos) {
var extra = ($input.attr('data-sanitize-insert-'+pos) || '').replace(/\[SPACE\]/g, ' ');
if ( (pos === 'left' && val.indexOf(extra) === 0) || (pos === 'right' && val.substring(val.length - extra.length) === extra)) {
return val;
}
return (pos === 'left' ? extra:'') + val + (pos === 'right' ? extra : '');
},
insertRight : function(val, $input) {
return this.insert(val, $input, 'right');
},
insertLeft : function(val, $input) {
return this.insert(val, $input, 'left');
},
numberFormat : function(val, $input) {
if (val.length === 0) {
return val;
}
if ( 'numeral' in window ) {
//If this has been previously formatted, it needs to be unformatted first before being reformatted.
//Else numeral will fail
val = numeral().unformat(val);
val = numeral(val).format( $input.attr('data-sanitize-number-format') );
}
else {
throw new ReferenceError('Using sanitation function "numberFormat" requires that you include numeral.js ' +
'(http://numeraljs.com/)');
}
return val;
},
strip: function(val, $input) {
var toRemove = $input.attr('data-sanitize-strip') || '';
$.split(toRemove, function(char) {
var regex = new RegExp($.isNumeric(char) ? char : '\\'+char, 'g');
val = val.replace(regex, '');
});
return val;
},
escape : function(val, $input) {
}
});

$.formUtils.addSanitizer({
name : 'insertRight',
sanitizerFunction : function(val, $input) {
return $.formUtils.sanitizers.insert.sanitizerFunction(val, $input, 'right');
}
});

$.formUtils.addSanitizer({
name : 'insertLeft',
sanitizerFunction : function(val, $input) {
return $.formUtils.sanitizers.insert.sanitizerFunction(val, $input, 'left');
}
});

$.formUtils.addSanitizer({
name : 'numberFormat',
sanitizerFunction : function(val, $input) {
if (val.length === 0) {
return val;
}
if ( 'numeral' in window ) {
//If this has been previously formatted, it needs to be unformatted first before being reformatted.
//Else numeral will fail
val = numeral().unformat(val);
val = numeral(val).format( $input.attr('data-sanitize-number-format') );
}
else {
throw new ReferenceError('Using sanitation function "numberFormat" requires that you include numeral.js ' +
'(http://numeraljs.com/)');
}
return val;
}
});

$.formUtils.addSanitizer({
name : 'strip',
sanitizerFunction : function(val, $input) {
var toRemove = $input.attr('data-sanitize-strip') || '';
$.split(toRemove, function(char) {
var regex = new RegExp($.isNumeric(char) ? char : '\\'+char, 'g');
val = val.replace(regex, '');
});
return val;
}
});

$.formUtils.addSanitizer({
name : 'escape',
sanitizerFunction : function(val, $input) {
var isEscaped = $input.valAttr('is-escaped'),
entities = {
'<' : '__%AMP%__lt;',
Expand All @@ -117,27 +159,35 @@
});

return val.replace(new RegExp('__\%AMP\%__', 'g'), '&');
}
},
}
});

$.formUtils.registerLoadedModule('sanitize');

var inputsThatCantBeSanitized = '[type="button"], [type="submit"], [type="radio"], [type="checkbox"], [type="reset"], [type="search"]',
setupSanitation = function(evt, $forms, config) {

if ( !$forms ) {
$forms = $('form');
}
if ( !$forms.each ) {
if ( !$forms.each ) {
$forms = $($forms);
}

var execSanitationCommands = function() {

var $input = $(this),
value = $input.val();
$.split($input.attr('data-sanitize'), function(command) {
if ( command in sanitizeCommands ) {
value = sanitizeCommands[command](value, $input, config);
}
else {
$.split($input.attr('data-sanitize'), function(command) {

var sanitizer = $.formUtils.sanitizers[command];

if (sanitizer) {
value = sanitizer.sanitizerFunction(value, $input, config);
} else {
throw new Error('Use of unknown sanitize command "'+command+'"');
}

});
$input
.val(value)
Expand Down
31 changes: 31 additions & 0 deletions test/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ <h4>Validate on submit</h4>
<input type="text" name="amount" data-validation="number" data-validation-allowing="float"
data-sanitize="numberFormat" data-sanitize-number-format="0,0.0">
</div>
<div class="form-group">
<label class="control-label">Proper Case (mcdonalds to McDonalds)</label>
<input name="proper case" class="form-control" name="test3" data-sanitize="proper_case" />
</div>
<div class="form-group">
<label class="control-label">Alphanumeric (will only be validated if checkbox below is checked)</label>
<input name="test2"
Expand Down Expand Up @@ -407,6 +411,33 @@ <h2>Validation Module: Poland</h2>
errorMessageKey: 'badEvenNumber',
});

// UK Surname Proper Casing
$.formUtils.addSanitizer({
name : 'proper_case',
sanitizerFunction : function(value) {
value = value.toLocaleLowerCase();
value = value.substring(0, 1).toUpperCase() + value.substring(1);
intPointer = value.indexOf(' ');
while (intPointer > -1) {
value = value.substring(0, intPointer + 1) + value.substring(intPointer + 1, intPointer + 2).toUpperCase() + value.substring(intPointer + 2);
intPointer = value.indexOf(' ', intPointer + 1);
}
intPointer = value.indexOf('-');
if (intPointer > -1)
value = value.substring(0, intPointer + 1) + value.substring(intPointer + 1, intPointer + 2).toUpperCase() + value.substring(intPointer + 2);
intPointer = value.indexOf('O\'');
if (intPointer > -1)
value = value.substring(0, intPointer + 2) + value.substring(intPointer + 2, intPointer + 3).toUpperCase() + value.substring(intPointer + 3);
intPointer = value.indexOf('Mc');
if (intPointer > -1)
value = value.substring(0, intPointer + 2) + value.substring(intPointer + 2, intPointer + 3).toUpperCase() + value.substring(intPointer + 3);
intPointer = value.indexOf('Mac');
if (intPointer > -1)
value = value.substring(0, intPointer + 3) + value.substring(intPointer + 3, intPointer + 4).toUpperCase() + value.substring(intPointer + 4);
return value;
}
});

window.applyValidation = function(validateOnBlur, forms, messagePosition, xtraModule) {
if( !forms )
forms = 'form';
Expand Down