Fixed bug in depends-on validation victorjonsson#472

Author: victorjonsson

form-validator/brazil.js

@@ -17,7 +17,7 @@
 /** File generated by Grunt -- do not modify
  *  JQUERY-FORM-VALIDATOR
  *
- *  @version 2.3.33
+ *  @version 2.3.34
  *  @website http://formvalidator.net/
  *  @author Victor Jonsson, http://victorjonsson.se
  *  @license MIT
@@ -903,11 +903,14 @@
         var findScriptPathAndLoadModules = function () {
           var foundPath = false;
           $('script[src*="form-validator"]').each(function () {
-            foundPath = this.src.substr(0, this.src.lastIndexOf('/')) + '/';
-            if (foundPath === '/') {
-              foundPath = '';
+            var isScriptFromPluginNodeModulesDirectory = this.src.split('form-validator')[1].split('node_modules').length > 1;
+            if (!isScriptFromPluginNodeModulesDirectory) {
+              foundPath = this.src.substr(0, this.src.lastIndexOf('/')) + '/';
+              if (foundPath === '/') {
+                foundPath = '';
+              }
+              return false;
             }
-            return false;
           });
 
           if (foundPath !== false) {
@@ -940,16 +943,21 @@
    * delimiter can be space, comma, dash or pipe
    * @param {String} val
    * @param {Function|String} [callback]
+   * @param {Boolean} [allowSpaceAsDelimiter]
    * @returns {Array|void}
    */
-  $.split = function (val, callback) {
+  $.split = function (val, callback, allowSpaceAsDelimiter) {
+    // default to true
+    allowSpaceAsDelimiter = allowSpaceAsDelimiter === undefined || allowSpaceAsDelimiter === true;
+    var pattern = '[,|\-'+(allowSpaceAsDelimiter ? '\\s':'')+']\\s*',
+      regex = new RegExp(pattern, 'g');
     if (typeof callback !== 'function') {
       // return array
       if (!val) {
         return [];
       }
       var values = [];
-      $.each(val.split(callback ? callback : /[,|\-\s]\s*/g),
+      $.each(val.split(callback ? callback : regex),
         function (i, str) {
           str = $.trim(str);
           if (str.length) {
@@ -960,7 +968,7 @@
       return values;
     } else if (val) {
       // exec callback func on each
-      $.each(val.split(/[,|\-\s]\s*/g),
+      $.each(val.split(regex),
         function (i, str) {
           str = $.trim(str);
           if (str.length) {
@@ -1311,7 +1319,7 @@
 
         }
 
-      }, ' ');
+      });
 
 
       if (isValid === false) {

form-validator/date.js

@@ -1,7 +1,7 @@
 /** File generated by Grunt -- do not modify
  *  JQUERY-FORM-VALIDATOR
  *
- *  @version 2.3.33
+ *  @version 2.3.34
  *  @website http://formvalidator.net/
  *  @author Victor Jonsson, http://victorjonsson.se
  *  @license MIT

form-validator/file.js

@@ -7,7 +7,7 @@
         "validation",
         "validator"
     ],
-    "version": "2.3.33",
+    "version": "2.3.34",
     "author": {
         "name": "Victor Jonsson",
         "url": "http://victorjonsson.se",

form-validator/html5.js

@@ -1,7 +1,7 @@
 {
   "name": "jquery-form-validator",
   "description": "With this feature rich jQuery plugin it becomes 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 bandwidth as possible. This is achieved by grouping together validation functions in \"modules\", making it possible for the programmer to load only those functions that's needed to validate a particular form.",
-  "version": "2.3.33",
+  "version": "2.3.34",
   "main": "./form-validator/jquery.form-validator.min.js",
   "keywords": [
     "form",

form-validator/jquery.form-validator.js

@@ -114,11 +114,14 @@
         var findScriptPathAndLoadModules = function () {
           var foundPath = false;
           $('script[src*="form-validator"]').each(function () {
-            foundPath = this.src.substr(0, this.src.lastIndexOf('/')) + '/';
-            if (foundPath === '/') {
-              foundPath = '';
+            var isScriptFromPluginNodeModulesDirectory = this.src.split('form-validator')[1].split('node_modules').length > 1;
+            if (!isScriptFromPluginNodeModulesDirectory) {
+              foundPath = this.src.substr(0, this.src.lastIndexOf('/')) + '/';
+              if (foundPath === '/') {
+                foundPath = '';
+              }
+              return false;
             }
-            return false;
           });
 
           if (foundPath !== false) {

form-validator/jquery.form-validator.min.js

@@ -11,16 +11,21 @@
    * delimiter can be space, comma, dash or pipe
    * @param {String} val
    * @param {Function|String} [callback]
+   * @param {Boolean} [allowSpaceAsDelimiter]
    * @returns {Array|void}
    */
-  $.split = function (val, callback) {
+  $.split = function (val, callback, allowSpaceAsDelimiter) {
+    // default to true
+    allowSpaceAsDelimiter = allowSpaceAsDelimiter === undefined || allowSpaceAsDelimiter === true;
+    var pattern = '[,|\-'+(allowSpaceAsDelimiter ? '\\s':'')+']\\s*',
+      regex = new RegExp(pattern, 'g');
     if (typeof callback !== 'function') {
       // return array
       if (!val) {
         return [];
       }
       var values = [];
-      $.each(val.split(callback ? callback : /[,|\-\s]\s*/g),
+      $.each(val.split(callback ? callback : regex),
         function (i, str) {
           str = $.trim(str);
           if (str.length) {
@@ -31,7 +36,7 @@
       return values;
     } else if (val) {
       // exec callback func on each
-      $.each(val.split(/[,|\-\s]\s*/g),
+      $.each(val.split(regex),
         function (i, str) {
           str = $.trim(str);
           if (str.length) {