minor bug fixed, renamed functions in modules, closing up on version 2.1

Author: victorjonsson

README.md

@@ -299,6 +299,10 @@ if **validateOnBlur** = true, jQ finds all form input elements with the data-val
 
 ## Changelog
 
+#### 2.1
+  * Code refactoring and some functions renamed
+  * Validator "checkbox_group" added
+
 #### 2.0.7
  * Now possible to validate file size, extension and mime type (using the file module)
 
@@ -320,8 +324,8 @@ if **validateOnBlur** = true, jQ finds all form input elements with the data-val
 [Victor Jonsson](https://github.com/victorjonsson)
 
 #### Contributors
-<a href="https://github.com/robamaton" target="_blank">Joel Sutherland</a><br />
 <a href="http://stevewasiura.waztech.com" target="_blank">Steve Wasiura</a><br />
+<a href="https://github.com/robamaton" target="_blank">Joel Sutherland</a><br />
 <a href="https://github.com/mattclements" target="_blank">Matt Clements</a><br />
 <a href="https://github.com/dfcplc" target="_blank">@dfcplc</a><br />
 <a href="https://github.com/coffein" target="_blank">Andree Wendel</a><br />

form-validator/date.dev.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.0.10
+ * @version 2.0.12
  */
 (function($) {
 
@@ -19,7 +19,7 @@
      */
     $.formUtils.addValidator({
         name : 'time',
-        validate : function(time) {
+        validatorFunction : function(time) {
             if (time.match(/^(\d{2}):(\d{2})$/) === null) {
                 return false;
             } else {
@@ -40,7 +40,7 @@
      */
     $.formUtils.addValidator({
         name : 'birthdate',
-        validate : function(val, $el, conf) {
+        validatorFunction : function(val, $el, conf) {
             var dateFormat = 'yyyy-mm-dd';
             if($el.valAttr('format')) {
                 dateFormat = $el.valAttr('format');

form-validator/date.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.0.10
+ * @version 2.0.12
  */
 (function($, window) {
 
@@ -34,7 +34,7 @@
      */
     $.formUtils.addValidator({
         name : 'mime',
-        validate : function(str, $input) {
+        validatorFunction : function(str, $input) {
             var files = $input.get(0).files || [];
 
             if( SUPPORTS_FILE_READER ) {
@@ -56,7 +56,7 @@
                 return valid;
 
             } else {
-                return $.formUtils.validators.extension.validate(str, $input);
+                return $.formUtils.validators.extension.validatorFunction(str, $input);
             }
         },
         errorMessage : 'The file you are trying to upload is of wrong type',
@@ -68,7 +68,7 @@
      */
     $.formUtils.addValidator({
         name : 'extension',
-        validate : function(val, $input) {
+        validatorFunction : function(val, $input) {
             var ext = val.substr( val.lastIndexOf('.')+1 );
             return $.inArray(ext.toLowerCase(), _getTypes($input)) > -1;
         },
@@ -81,7 +81,7 @@
      */
     $.formUtils.addValidator({
         name : 'size',
-        validate : function(val, $input) {
+        validatorFunction : function(val, $input) {
             var maxSize = $input.valAttr('max-size');
             if( !maxSize ) {
                 console.log('Input "'+$input.attr('name')+'" is missing data-validation-max-size attribute');

form-validator/file.dev.js

@@ -5,7 +5,7 @@
 *
 * @website http://formvalidator.net/
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 2.0.10
+* @version 2.0.12
 */
 (function($) {
 
@@ -387,7 +387,7 @@
      * Short hand function that makes the validation setup require less code
      * @param config
      */
-    $.validatorLoad = function(config) {
+    $.setupForm = function(config) {
         config = $.extend({
             form : 'form',
             validateOnBlur : true,
@@ -1094,9 +1094,7 @@
             groupCheckedRangeStart : 'Please choose between ',
             groupCheckedTooFewStart : 'Please choose at least ',
             groupCheckedTooManyStart : 'Please choose a maximum of ',           
-            groupCheckedEnd : ' item(s)',
-            
-            _dummy--last-item-placeholder-without-comma : 0
+            groupCheckedEnd : ' item(s)'
         }
     };
 
@@ -1242,12 +1240,13 @@
             }
 
             // check if length is above min, below max, within range etc.
-                var lengthCheckResults = $.formUtils.numericRangeCheck(value.length, lengthAllowed) ;
+                var lengthCheckResults = $.formUtils.numericRangeCheck(value.length, lengthAllowed),
+                    checkResult;
 
                 switch(lengthCheckResults[0] )
                 {   // outside of allowed range
                     case "out":
-                        this.errorMessage = lang.lengthBadStart + len + lang.lengthBadEnd;
+                        this.errorMessage = lang.lengthBadStart + lengthAllowed + lang.lengthBadEnd;
                         checkResult = false;
                         break;
                     // too short
@@ -1385,15 +1384,14 @@
     });
 
 
-/*  
+    /*
     * Validate group of checkboxes, validate qty required is checked
     * written by Steve Wasiura : http://stevewasiura.waztech.com
     * element attrs
     *    data-validation="checkbox_group"
     *    data-validation-qty="1-2"  // min 1 max 2
     *    data-validation-error-msg="chose min 1, max of 2 checkboxes"
     */
-   
     $.formUtils.addValidator({
         name : 'checkbox_group',
         validatorFunction : function(val, $el, config, lang, $form) 
@@ -1439,6 +1437,5 @@
      //   errorMessage : '', // set above in switch statement
      //   errorMessageKey: '' // not used
     });
-    
 
 })(jQuery);

form-validator/file.js

@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.0.10
+ * @version 2.0.12
  */
 (function($) {
 
@@ -19,7 +19,7 @@
      */
     $.formUtils.addValidator({
         name : 'country',
-        validate : function(str) {
+        validatorFunction : function(str) {
             return $.inArray(str.toLowerCase(), this.countries) > -1;
         },
         countries : ['afghanistan','albania','algeria','american samoa','andorra','angola','anguilla','antarctica','antigua and barbuda','arctic ocean','argentina','armenia','aruba','ashmore and cartier islands','atlantic ocean','australia','austria','azerbaijan','bahamas','bahrain','baltic sea','baker island','bangladesh','barbados','bassas da india','belarus','belgium','belize','benin','bermuda','bhutan','bolivia','borneo','bosnia and herzegovina','botswana','bouvet island','brazil','british virgin islands','brunei','bulgaria','burkina faso','burundi','cambodia','cameroon','canada','cape verde','cayman islands','central african republic','chad','chile','china','christmas island','clipperton island','cocos islands','colombia','comoros','cook islands','coral sea islands','costa rica','croatia','cuba','cyprus','czech republic','democratic republic of the congo','denmark','djibouti','dominica','dominican republic','east timor','ecuador','egypt','el salvador','equatorial guinea','eritrea','estonia','ethiopia','europa island','falkland islands','faroe islands','fiji','finland','france','french guiana','french polynesia','french southern and antarctic lands','gabon','gambia','gaza strip','georgia','germany','ghana','gibraltar','glorioso islands','greece','greenland','grenada','guadeloupe','guam','guatemala','guernsey','guinea','guinea-bissau','guyana','haiti','heard island and mcdonald islands','honduras','hong kong','howland island','hungary','iceland','india','indian ocean','indonesia','iran','iraq','ireland','isle of man','israel','italy','jamaica','jan mayen','japan','jarvis island','jersey','johnston atoll','jordan','juan de nova island','kazakhstan','kenya','kerguelen archipelago','kingman reef','kiribati','kosovo','kuwait','kyrgyzstan','laos','latvia','lebanon','lesotho','liberia','libya','liechtenstein','lithuania','luxembourg','macau','macedonia','madagascar','malawi','malaysia','maldives','mali','malta','marshall islands','martinique','mauritania','mauritius','mayotte','mediterranean sea','mexico','micronesia','midway islands','moldova','monaco','mongolia','montenegro','montserrat','morocco','mozambique','myanmar','namibia','nauru','navassa island','nepal','netherlands','netherlands antilles','new caledonia','new zealand','nicaragua','niger','nigeria','niue','norfolk island','north korea','north sea','northern mariana islands','norway','oman','pacific ocean','pakistan','palau','palmyra atoll','panama','papua new guinea','paracel islands','paraguay','peru','philippines','pitcairn islands','poland','portugal','puerto rico','qatar','republic of the congo','reunion','romania','ross sea','russia','rwanda','saint helena','saint kitts and nevis','saint lucia','saint pierre and miquelon','saint vincent and the grenadines','samoa','san marino','sao tome and principe','saudi arabia','senegal','serbia','seychelles','sierra leone','singapore','slovakia','slovenia','solomon islands','somalia','south africa','south georgia and the south sandwich islands','south korea','southern ocean','spain','spratly islands','sri lanka','sudan','suriname','svalbard','swaziland','sweden','switzerland','syria','taiwan','tajikistan','tanzania','tasman sea','thailand','togo','tokelau','tonga','trinidad and tobago','tromelin island','tunisia','turkey','turkmenistan','turks and caicos islands','tuvalu','uganda','ukraine','united arab emirates','united kingdom','uruguay','usa','uzbekistan','vanuatu','venezuela','viet nam','virgin islands','wake island','wallis and futuna','west bank','western sahara','yemen','zambia','zimbabwe'],
@@ -32,7 +32,7 @@
      */
     $.formUtils.addValidator({
         name : 'federatestate',
-        validate : function(str) {
+        validatorFunction : function(str) {
             return $.inArray(str.toLowerCase(), this.states) > -1;
         },
         states : ['alabama','alaska','arkansas','california','colorado','connecticut','delaware','florida','georgia','hawaii','idaho','illinois','indiana','iowa','kansas','kentucky','louisiana','maine','marylan ','massachusetts','michigan','minnesota','mississippi','missouri','montana','nebraska','nevada','new hampshire','new jersey','new mexico','new york','north carolina','north dakota','ohio','oklahoma','oregon','pennsylvania','rhode island','south carolina','south dakota','tennessee','texas','utah','vermont','virginia','washington','west virginia','wisconsin','wyoming'],
@@ -43,7 +43,7 @@
 
     $.formUtils.addValidator({
         name : 'longlat',
-        validate : function(str) {
+        validatorFunction : function(str) {
             var regexp = /^[+-]?\d+\.\d+, ?[+-]?\d+\.\d+$/;
             return regexp.test(str);
         },