Merge pull request #11 from dof-dss/development

Unity modules release

Author: soda736

unity_common/js/unity-common-validation.ife.js

@@ -0,0 +1,41 @@
+/**
+ * @file
+ * Attaches behaviors for the Clientside Validation jQuery module.
+ */
+
+(function ($, drupalSettings) {
+
+  'use strict';
+
+  // Disable clientside validation for webforms submitted using Ajax.
+  // This prevents Computed elements with Ajax from breaking.
+  // @see
+  // \Drupal\clientside_validation_jquery\Form\ClientsideValidationjQuerySettingsForm
+  drupalSettings.clientside_validation_jquery.validate_all_ajax_forms = 0;
+
+  /**
+   * Add .cv-validate-before-ajax to all webform submit buttons.
+   *
+   * @type {Drupal~behavior}
+   */
+  Drupal.behaviors.errorMessageFixAjax = {
+    attach: function (context) {
+      $('form.search-form--site .form-actions .js-form-submit')
+        .once('error-message-fix-ajax')
+        .addClass('cv-validate-before-ajax');
+    }
+  };
+
+  $(document).once('errormessage-fix').on('cv-jquery-validate-options-update', function (event, options) {
+    options.errorElement = 'p';
+    options.showErrors = function (errorMap, errorList) {
+      // Show errors using defaultShowErrors().
+      this.defaultShowErrors();
+
+      // Add '.form-item--error-message' class to all errors.
+      $(this.currentForm).find('strong.error').addClass('form-item--error-message');
+
+    };
+  });
+
+})(jQuery, drupalSettings);

unity_common/unity_common.libraries.yml

@@ -4,3 +4,9 @@ link_manager:
   dependencies:
     - core/jquery
     - core/drupal
+unity_common_validation.ife:
+  version: VERSION
+  js:
+    js/unity-common-validation.ife.js: { weight: -1 }
+  dependencies:
+    - clientside_validation_jquery/cv.jquery.validate.ife

unity_common/unity_common.module

@@ -53,6 +53,12 @@ function unity_common_form_alter(&$form, FormStateInterface $form_state, $form_i
       );
     }
   }
+
+  if ($form['#id'] == 'views-exposed-form-search-site-search' || $form['#id'] == 'views-exposed-form-search-search-page') {
+    if (\Drupal::moduleHandler()->moduleExists('inline_form_errors')) {
+      $form['#attached']['library'][] = 'unity_common/unity_common_validation.ife';
+    }
+  }
 }
 
 /**