files missing in previous commit

Author: victorjonsson

src/main/deprecated.js

@@ -0,0 +1,91 @@
+/**
+ * Deprecated functions and attributes
+ * @todo: Remove in release of 3.0
+ */
+(function ($, undefined) {
+
+  'use strict';
+
+  /**
+   * @deprecated
+   * @param language
+   * @param conf
+   */
+  $.fn.validateForm = function (language, conf) {
+    $.formUtils.warn('Use of deprecated function $.validateForm, use $.isValid instead');
+    return this.isValid(language, conf, true);
+  };
+
+  $.formUtils.$win.bind('validatorsLoaded formValidationSetup', function(evt, $form, config) {
+    if( !$form ) {
+      $form = $('form');
+    }
+
+    addSupportForCustomErrorMessageCallback(config);
+    addSupportForElementReferenceInPositionParam(config);
+    addSupportForValidationDependingOnCheckedInput($form);
+  });
+
+
+  function addSupportForCustomErrorMessageCallback(config) {
+    if (config &&
+        config.errorMessagePosition === 'custom' &&
+        typeof config.errorMessageCustom === 'function') {
+
+      $.formUtils.warn('Use of deprecated function errorMessageCustom, use config.submitErrorMessageCallback instead');
+
+      config.submitErrorMessageCallback = function($form, errorMessages) {
+        config.errorMessageCustom(
+            $form,
+            config.language.errorTitle,
+            errorMessages,
+            config
+        );
+      };
+    }
+  }
+
+  function addSupportForElementReferenceInPositionParam(config) {
+    if (config.errorMessagePosition && typeof config.errorMessagePosition === 'object') {
+      $.formUtils.warn('Deprecated use of config parameter errorMessagePosition, use config.submitErrorMessageCallback instead');
+      var $errorMessageContainer = config.errorMessagePosition;
+      config.errorMessagePosition = 'top';
+      config.submitErrorMessageCallback = function() {
+        return $errorMessageContainer;
+      };
+    }
+  }
+
+  function addSupportForValidationDependingOnCheckedInput($form) {
+    var $inputsDependingOnCheckedInputs = $form.find('[data-validation-if-checked]');
+    if ($inputsDependingOnCheckedInputs.length) {
+      $.formUtils.warn(
+        'Detected use of attribute "data-validation-if-checked" which is '+
+        'deprecated. Use "data-validation-depends-on" provided by module "logic"'
+      );
+    }
+
+    $inputsDependingOnCheckedInputs
+      .on('beforeValidation', function() {
+
+        var $elem = $(this),
+          nameOfDependingInput = $elem.valAttr('if-checked');
+
+        // Set the boolean telling us that the validation depends
+        // on another input being checked
+        var $dependingInput = $('input[name="' + nameOfDependingInput + '"]', $form),
+          dependingInputIsChecked = $dependingInput.is(':checked'),
+          valueOfDependingInput = ($.formUtils.getValue($dependingInput) || '').toString(),
+          requiredValueOfDependingInput = $elem.valAttr('if-checked-value');
+
+        if (!dependingInputIsChecked || !(
+              !requiredValueOfDependingInput ||
+              requiredValueOfDependingInput === valueOfDependingInput
+          )) {
+          $elem.valAttr('skipped', true);
+        }
+
+      });
+    }
+
+})(jQuery);

src/modules/logic.js

@@ -0,0 +1,53 @@
+/**
+ * jQuery Form Validator Module: Logic
+ * ------------------------------------------
+ * Created by Victor Jonsson <http://www.victorjonsson.se>
+ *
+ * - data-validation-depends-on
+ * - data-validation-if-answered
+ *
+ * @website http://formvalidator.net/#logic
+ * @license MIT
+ */
+(function($) {
+
+	'use strict';
+
+  var setupValidationDependsOn = function($form) {
+
+      $form.find('[data-validation-depends-on]')
+        .on('beforeValidation', function() {
+
+            var $elem = $(this),
+              nameOfDependingInput = $elem.valAttr('depends-on') || $elem.valAttr('if-checked');
+
+            // Whether or not this input should be validated depends on if another input has a value
+            if (nameOfDependingInput) {
+
+              // Set the boolean telling us that the validation depends
+              // on another input being checked
+              var valueOfDependingInput = $.formUtils.getValue('input[name="' + nameOfDependingInput + '"]', $form),
+                requiredValueOfDependingInput = $elem.valAttr('depends-on-value'),
+                dependingInputHasRequiredValue = !requiredValueOfDependingInput || requiredValueOfDependingInput === valueOfDependingInput;
+
+              if (!dependingInputHasRequiredValue) {
+                $elem.valAttr('skipped', true);
+              }
+            }
+
+        });
+
+    },
+    setupValidationIfAnswered = function() {
+
+    };
+
+  $.formUtils.$win.bind('validatorsLoaded formValidationSetup', function(evt, $form) {
+    if( !$form ) {
+      $form = $('form');
+    }
+    setupValidationDependsOn($form);
+    setupValidationIfAnswered($form);
+  });
+
+})(jQuery);

test/test.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/css/bootstrap.min.css">
+
+  <!-- Latest compiled and minified CSS -->
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
+
+  <link href="//cdnjs.cloudflare.com/ajax/libs/jquery-form-validator/2.2.8/theme-default.min.css"
+        rel="stylesheet" type="text/css" /></head>
+
+<body>
+<div>
+  <form action="" style="margin: 3% auto; max-width: 400px" role="form">
+
+    <div class="input-group">
+      <input data-validation="required"
+             data-validation-error-msg-container="#error-container"
+             class="form-control">
+      <span class="input-group-addon" id="basic-addon2">@example.com</span>
+    </div>
+    <div id="error-container"></div>
+
+    <hr>
+    <div class="form-group">
+      <button type="submit">Submit</button>
+      <hr>
+      <a href="#" onclick="testIsValid(); return false;">
+        [test isValid()]
+      </a>
+    </div>
+
+  </form>
+</div>
+
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+<script src="../form-validator/jquery.form-validator.min.js"></script>
+
+<script>
+
+  $.validate();
+
+</script>
+
+
+</body>
+</html>