Extension validation now also works on ordinary text inputs

victorjonsson · victorjonsson · commit 539ced52e63b · 2014-12-31T15:12:48.000+01:00
diff --git a/form-validator/date.dev.js b/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.2.beta.26
+ * @version 2.2.beta.29
  */
 (function($) {
 
diff --git a/form-validator/file.dev.js b/form-validator/file.dev.js
@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.26
+ * @version 2.2.beta.29
  */
 (function($, window) {
 
@@ -44,28 +44,31 @@
     $.formUtils.addValidator({
         name : 'mime',
         validatorFunction : function(str, $input) {
-            var files = $input.get(0).files || [];
 
             if( SUPPORTS_FILE_READER ) {
                 var valid = true,
+                    files = $input.get(0).files || [],
                     mime = '',
                     allowedTypes = _getTypes($input);
 
-                $.each(files, function(i, file) {
-                    valid = false;
-                    mime = file.type || '';
-                    $.each(allowedTypes, function(j, type) {
-                        valid = mime.indexOf(type) > -1;
-                        if( valid ) {
-                            return false;
-                        }
+                if( files.length ) {
+                    $.each(files, function(i, file) {
+                        valid = false;
+                        mime = file.type || '';
+                        $.each(allowedTypes, function(j, type) {
+                            valid = mime.indexOf(type) > -1;
+                            if( valid ) {
+                                return false;
+                            }
+                        });
+                        return valid;
                     });
-                    return valid;
-                });
 
-                if( !valid ) {
-                    _log('Trying to upload a file with mime type '+mime+' which is not allowed');
+                    if( !valid ) {
+                        _log('Trying to upload a file with mime type '+mime+' which is not allowed');
+                    }
                 }
+
                 return valid;
                 
             } else {
@@ -86,9 +89,10 @@
             var valid = true,
                 types = _getTypes($input);
 
-            $.each($input.get(0).files || [], function(i, file) {
-                var val = file.value || file.fileName || file.name,
+            $.each($input.get(0).files || [value], function(i, file) {
+                var val = typeof file == 'string' ? file : (file.value || file.fileName || file.name),
                     ext = val.substr( val.lastIndexOf('.')+1 );
+
                 if( $.inArray(ext.toLowerCase(), types) == -1 ) {
                     valid = false;
                     return false;
diff --git a/form-validator/file.js b/form-validator/file.js
diff --git a/form-validator/form-test.html b/form-validator/form-test.html
@@ -177,6 +177,14 @@
                    data-validation-allowing="jpg, png, ico"
                    data-validation-max-size="400kb" />
         </div>
+        <div class="form-group">
+            <label class="control-label">File name</label>
+            <input type="text" name="some-file2" class="form-control"
+                   data-validation="extension required"
+                   data-validation-error-msg="You must write a file name with extension jpg|png|ico"
+                   data-validation-allowing="jpg, png, ico"
+                    />
+        </div>
         <div class="form-group">
             <label class="control-label">
                 Callback validation, set this value to &quot;1&quot; and
diff --git a/form-validator/html5.dev.js b/form-validator/html5.dev.js
@@ -17,7 +17,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.26
+ * @version 2.2.beta.29
  */
 (function($, window) {
 
diff --git a/form-validator/jquery.form-validator.js b/form-validator/jquery.form-validator.js
@@ -5,7 +5,7 @@
 *
 * @website http://formvalidator.net/
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 2.2.beta.26
+* @version 2.2.beta.29
 */
 (function($) {
 
diff --git a/form-validator/jquery.form-validator.min.js b/form-validator/jquery.form-validator.min.js
diff --git a/form-validator/location.dev.js b/form-validator/location.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.2.beta.26
+ * @version 2.2.beta.29
  */
 (function($) {
 
diff --git a/form-validator/security.dev.js b/form-validator/security.dev.js
@@ -13,7 +13,7 @@
  *  - cvv
  *
  * @website http://formvalidator.net/#security-validators
- * @version 2.2.beta.26
+ * @version 2.2.beta.29
  */
 (function($, window) {
 
diff --git a/form-validator/sweden.dev.js b/form-validator/sweden.dev.js
@@ -13,7 +13,7 @@
  *
  * @website http://formvalidator.net/#swedish-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.26
+ * @version 2.2.beta.29
  */
 (function($, window) {
 
diff --git a/form-validator/uk.dev.js b/form-validator/uk.dev.js
@@ -9,7 +9,7 @@
  *
  * @website http://formvalidator.net/#uk-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.beta.26
+ * @version 2.2.beta.29
  */
 $.formUtils.addValidator({
     name : 'ukvatnumber',

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @website http://formvalidator.net/#location-validators`
`12`	`12`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`13`		`- * @version 2.2.beta.26`
	`13`	`+ * @version 2.2.beta.29`
`14`	`14`	`*/`
`15`	`15`	`(function($) {`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`* @website http://formvalidator.net/`
`19`	`19`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`20`		`- * @version 2.2.beta.26`
	`20`	`+ * @version 2.2.beta.29`
`21`	`21`	`*/`
`22`	`22`	`(function($, window) {`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* @website http://formvalidator.net/`
`7`	`7`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`8`		`-* @version 2.2.beta.26`
	`8`	`+* @version 2.2.beta.29`
`9`	`9`	`*/`
`10`	`10`	`(function($) {`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* - cvv`
`14`	`14`	`*`
`15`	`15`	`* @website http://formvalidator.net/#security-validators`
`16`		`- * @version 2.2.beta.26`
	`16`	`+ * @version 2.2.beta.29`
`17`	`17`	`*/`
`18`	`18`	`(function($, window) {`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* @website http://formvalidator.net/#uk-validators`
`11`	`11`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`12`		`- * @version 2.2.beta.26`
	`12`	`+ * @version 2.2.beta.29`
`13`	`13`	`*/`
`14`	`14`	`$.formUtils.addValidator({`
`15`	`15`	`name : 'ukvatnumber',`