Merge branch 'master' of github.com:victorjonsson/jQuery-Form-Validator

Author: victorjonsson

README.md

@@ -40,7 +40,7 @@ particular form.
 
 ### Support for HTML5
 
-As of version 2.2 (unreleased) you can use this plugin as a fallback solution for the validation attributes in the HTML5 spec. Add the module `html5` to the module string and you can use the following native features:
+As of version 2.2 (unreleased) you can use this plugin as a fallback solution for the validation attributes in the HTML5 spec. Add the module `html5` to the module declaration and you can use the following native features:
 
 **Attributes**: require, pattern, maxlength, min, max, placeholder
 
@@ -67,6 +67,7 @@ As of version 2.2 (unreleased) you can use this plugin as a fallback solution fo
  * Make validation dependent on another input of type checkbox being checked by adding attribute
  data-validation-if-checked="name of checkbox input"
  * Create input suggestions with ease, no jquery-ui needed
+ * to apply multiple validators to an input element, separate the validator names using a space (ex: required email)
 
 Read the documentation for the default features at [http://formvalidator.net/#default-validators](http://formvalidator.net/#default-validators)
 

form-validator/jquery.form-validator.js

@@ -762,16 +762,11 @@
             } else {
                 var findScriptPathAndLoadModules = function() {
                     var foundPath = false;
-                    $('script').each(function() {
-                        if( this.src ) {
-                            var scriptName = this.src.substr(this.src.lastIndexOf('/')+1, this.src.length);
-                            if(scriptName.indexOf('jquery.form-validator.js') > -1 || scriptName.indexOf('jquery.form-validator.min.js') > -1) {
-                                foundPath = this.src.substr(0, this.src.lastIndexOf('/')) + '/';
-                                if( foundPath == '/' )
-                                    foundPath = '';
-                                return false;
-                            }
-                        }
+                    $('script[src*="form-validator"]').each(function() {
+                        foundPath = this.src.substr(0, this.src.lastIndexOf('/')) + '/';
+                        if( foundPath == '/' )
+                            foundPath = '';
+                        return false;
                     });
 
                     if( foundPath !== false) {