Skip to content

Most of JS Hint errors resolved #309

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 1 commit into from
Oct 7, 2015
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
10 changes: 5 additions & 5 deletions form-validator/brazil.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ $.formUtils.addValidator({
// http://www.devmedia.com.br/validar-cpf-com-javascript/23916

// clean up the input (digits only) and set some support vars
var cpf = string.replace(/\D/g,"");
var cpf = string.replace(/\D/g,'');
var sum1 = 0;
var sum2 = 0;
var remainder1 = 0;
var remainder2 = 0;

// skip special cases
if (cpf.length != 11 || cpf == "00000000000") {
if (cpf.length !== 11 || cpf === '00000000000') {
return false;
}

// check 1st verification digit
for (i=1; i<=9; i++) {
for (i = 1; i<= 9; i++) {
sum1 += parseInt(cpf.substring(i - 1, i)) * (11 - i);
}
remainder1 = (sum1 * 10) % 11;
if (remainder1 >= 10) {
remainder1 = 0;
}
if (remainder1 != parseInt(cpf.substring(9, 10))) {
if (remainder1 !== parseInt(cpf.substring(9, 10))) {
return false;
}

Expand All @@ -53,7 +53,7 @@ $.formUtils.addValidator({
if (remainder2 >= 10) {
remainder2 = 0;
}
if (remainder2 != parseInt(cpf.substring(10, 11))) {
if (remainder2 !== parseInt(cpf.substring(10, 11))) {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion form-validator/date.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
if($el.valAttr('format')) {
dateFormat = $el.valAttr('format');
}
else if(typeof conf.dateFormat != 'undefined') {
else if(typeof conf.dateFormat !== 'undefined') {
dateFormat = conf.dateFormat;
}

Expand Down
60 changes: 31 additions & 29 deletions form-validator/file.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,19 @@

'use strict';

var SUPPORTS_FILE_READER = typeof window.FileReader != 'undefined',
var SUPPORTS_FILE_READER = typeof window.FileReader !== 'undefined',

/**
* @return {Array}
*/
_getTypes = function($input) {
var allowedTypes = $.split( ($input.valAttr('allowing') || '').toLowerCase() );
if( $.inArray('jpg', allowedTypes) > -1 && $.inArray('jpeg', allowedTypes) == -1)
if ($.inArray('jpg', allowedTypes) > -1 && $.inArray('jpeg', allowedTypes) === -1) {
allowedTypes.push('jpeg');
else if( $.inArray('jpeg', allowedTypes) > -1 && $.inArray('jpg', allowedTypes) == -1)
}
else if ($.inArray('jpeg', allowedTypes) > -1 && $.inArray('jpg', allowedTypes) === -1) {
allowedTypes.push('jpg');
}
return allowedTypes;
},

Expand Down Expand Up @@ -133,10 +135,10 @@
allowedTypes = _getTypes($input);

$.each($input.get(0).files || [value], function(i, file) {
var val = typeof file == 'string' ? file : (file.value || file.fileName || file.name),
var val = typeof file === 'string' ? file : (file.value || file.fileName || file.name),
ext = val.substr( val.lastIndexOf('.')+1 );

if( $.inArray(ext.toLowerCase(), allowedTypes) == -1 ) {
if( $.inArray(ext.toLowerCase(), allowedTypes) === -1 ) {
valid = false;
_generateErrorMsg(_this, 'wrongFileType', allowedTypes.join(', '), language);
return false;
Expand Down Expand Up @@ -187,13 +189,13 @@
*/
$.formUtils.convertSizeNameToBytes = function(sizeName) {
sizeName = sizeName.toUpperCase();
if( sizeName.substr(sizeName.length-1, 1) == 'M' ) {
if( sizeName.substr(sizeName.length-1, 1) === 'M' ) {
return parseInt(sizeName.substr(0, sizeName.length-1), 10) * 1024 * 1024;
} else if( sizeName.substr(sizeName.length-2, 2) == 'MB' ) {
} else if( sizeName.substr(sizeName.length-2, 2) === 'MB' ) {
return parseInt(sizeName.substr(0, sizeName.length-2), 10) * 1024 * 1024;
} else if( sizeName.substr(sizeName.length-2, 2) == 'KB' ) {
} else if( sizeName.substr(sizeName.length-2, 2) === 'KB' ) {
return parseInt(sizeName.substr(0, sizeName.length-2), 10) * 1024;
} else if( sizeName.substr(sizeName.length-1, 1) == 'B' ) {
} else if( sizeName.substr(sizeName.length-1, 1) === 'B' ) {
return parseInt(sizeName.substr(0, sizeName.length-1), 10);
} else {
return parseInt(sizeName, 10);
Expand Down Expand Up @@ -223,7 +225,7 @@
maxDeclaration = false,
declarationParts = dimDeclaration.split('-');

if( declarationParts.length == 1 ) {
if( declarationParts.length === 1 ) {
if( declarationParts[0].indexOf('min') === 0 ) {
minDeclaration = declarationParts[0];
} else {
Expand Down Expand Up @@ -266,8 +268,6 @@
*/
$.formUtils.checkImageRatio = function(img, ratioDeclaration, language) {
var ratio = img.width / img.height,
minRatio = false,
maxRatio = false,
calculateRatio = function(declaration) {
var dims = declaration.replace('max', '').replace('min', '').split(':');
return dims[0] / dims[1];
Expand All @@ -277,15 +277,15 @@
return val >= min && val <= max;
};

if( declarationParts.length == 1 ) {
if( ratio !== calculateRatio(declarationParts[0]) )
return language.imageRatioNotAccepted;
}
else if( declarationParts.length == 2 && !isWithin(ratio, calculateRatio(declarationParts[0]), calculateRatio(declarationParts[1])) ) {
if ( declarationParts.length === 1 ) {
if ( ratio !== calculateRatio(declarationParts[0]) ) {
return language.imageRatioNotAccepted;
}

return false;
}
else if( declarationParts.length === 2 && !isWithin(ratio, calculateRatio(declarationParts[0]), calculateRatio(declarationParts[1])) ) {
return language.imageRatioNotAccepted;
}
return false;
};

/**
Expand All @@ -294,30 +294,30 @@
$.formUtils.addValidator({
name : 'dimension',
validatorFunction : function(val, $input, conf, language, $form) {

var hasCorrectDim = false;
if( SUPPORTS_FILE_READER ) {
var hasCorrectDim = true,
file = $input.get(0).files || [];
var file = $input.get(0).files || [];
hasCorrectDim = true;

if( $input.attr('data-validation').indexOf('mime') == -1) {
if( $input.attr('data-validation').indexOf('mime') === -1) {
alert('You should validate file type being jpg, gif or png on input '+$input[0].name);
return false;
}
else if( file.length > 1 ) {
alert('Validating image dimensions does not support inputs allowing multiple files');
return false;
} else if( file.length == 0) {
} else if( file.length === 0) {
return true;
}

if( $input.valAttr('has-valid-dim') ) {
return true;
}
else if( $input.valAttr('has-not-valid-dim') ) {
this.errorMessage = language['wrongFileDim'] + ' '+$input.valAttr('has-not-valid-dim');
this.errorMessage = language.wrongFileDim + ' ' + $input.valAttr('has-not-valid-dim');
return false;
}
else if($.formUtils.eventType == 'keyup') {
else if($.formUtils.eventType === 'keyup') {
return null;
}

Expand All @@ -334,11 +334,13 @@
_loadImage(file[0], function(img) {
var error = false;

if( $input.valAttr('dimension') )
if ( $input.valAttr('dimension') ) {
error = $.formUtils.checkImageDimension(img, $input.valAttr('dimension'), language);
}

if( !error && $input.valAttr('ratio') )
if ( !error && $input.valAttr('ratio') ) {
error = $.formUtils.checkImageRatio(img, $input.valAttr('ratio'), language);
}

// Set validation result flag on input
if( error ) {
Expand All @@ -353,7 +355,7 @@
$input
.valAttr('has-keyup-event', '1')
.bind('keyup change', function(evt) {
if( evt.keyCode != 9 && evt.keyCode != 16 ) {
if( evt.keyCode !== 9 && evt.keyCode !== 16 ) {
$(this)
.valAttr('has-not-valid-dim', false)
.valAttr('has-valid-dim', false);
Expand Down
17 changes: 10 additions & 7 deletions form-validator/html5.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
(function($, window) {

"use strict";
'use strict';

var SUPPORTS_PLACEHOLDER = 'placeholder' in document.createElement('INPUT'),
SUPPORTS_DATALIST = 'options' in document.createElement('DATALIST'),
Expand Down Expand Up @@ -61,10 +61,12 @@
var max = $input.attr('max'),
min = $input.attr('min');
if( min || max ) {
if( !min )
if ( !min ) {
min = '0';
if( !max )
}
if ( !max ) {
max = '9007199254740992'; // js max int
}

attrs['data-validation-allowing'] = 'range['+min+';'+max+']';
if( min.indexOf('-') === 0 || max.indexOf('-') === 0 ) {
Expand Down Expand Up @@ -94,7 +96,7 @@
suggestions.push($(this).text());
});

if( suggestions.length == 0 ) {
if( suggestions.length === 0 ) {
// IE fix
var opts = $.trim($('#'+$input.attr('list')).text()).split('\n');
$.each(opts, function(i, option) {
Expand All @@ -107,8 +109,9 @@
$.formUtils.suggest( $input, suggestions );
}

if( isRequired && validation.length == 0 )
if ( isRequired && validation.length === 0 ) {
validation.push('required');
}

if( validation.length ) {
if( !isRequired ) {
Expand All @@ -133,13 +136,13 @@
this.defaultValue = this.getAttribute('placeholder');
$(this)
.bind('focus', function() {
if(this.value == this.defaultValue) {
if(this.value === this.defaultValue) {
this.value = '';
$(this).removeClass('showing-placeholder');
}
})
.bind('blur', function() {
if($.trim(this.value) == '') {
if($.trim(this.value) === '') {
this.value = this.defaultValue;
$(this).addClass('showing-placeholder');
}
Expand Down
Loading