diff --git a/clientside_validation.js b/clientside_validation.js index 417f274..2de8a0c 100644 --- a/clientside_validation.js +++ b/clientside_validation.js @@ -1650,8 +1650,10 @@ var $ajax_el = $(Drupal.ajax[ajax_el].element); var ajax_form = $ajax_el.is('form') ? $ajax_el.attr('id') : $ajax_el.closest('form').attr('id'); var change_ajax = true; - if (ajax_form != null && typeof Drupal.myClientsideValidation.forms[ajax_form] !== 'undefined') { - change_ajax = Boolean(parseInt(Drupal.myClientsideValidation.forms[ajax_form].general.validateBeforeAjax, 10)); + if (Drupal.myClientsideValidation && Drupal.myClientsideValidation.forms) { + if (ajax_form != null && typeof Drupal.myClientsideValidation.forms[ajax_form] !== 'undefined') { + change_ajax = Boolean(parseInt(Drupal.myClientsideValidation.forms[ajax_form].general.validateBeforeAjax, 10)); + } } if (!$ajax_el.hasClass('cancel') && change_ajax) { changeAjax(ajax_el); diff --git a/clientside_validation_field_validation/clientside_validation_field_validation.js b/clientside_validation_field_validation/clientside_validation_field_validation.js index 8ef9134..231d9ab 100644 --- a/clientside_validation_field_validation/clientside_validation_field_validation.js +++ b/clientside_validation_field_validation/clientside_validation_field_validation.js @@ -21,23 +21,25 @@ Drupal.behaviors.clientsideValidationFieldValidation = { attach: function () { $(document).bind('clientsideValidationInitialized', function(){ - for (var formid in Drupal.myClientsideValidation.validators) { - if (Drupal.myClientsideValidation.validators.hasOwnProperty(formid)) { - Drupal.myClientsideValidation.validators[formid].settings.showErrors = function (errorMap, errorList) { - this.defaultShowErrors(); - for (var index in errorList) { - var $element = $(errorList[index].element); - var label = this.errorsFor(errorList[index].element); - if ( label.length ) { - label.html( - label.html() - .replace("[value]", $element.val()) - .replace("[length]", $element.val().length) - .replace("[field-name]", $element.closest(".form-item").find('label').first().text().replace(' *','')) - ); + if (Drupal.myClientsideValidation && Drupal.myClientsideValidation.validators) { + for (var formid in Drupal.myClientsideValidation.validators) { + if (Drupal.myClientsideValidation.validators.hasOwnProperty(formid)) { + Drupal.myClientsideValidation.validators[formid].settings.showErrors = function (errorMap, errorList) { + this.defaultShowErrors(); + for (var index in errorList) { + var $element = $(errorList[index].element); + var label = this.errorsFor(errorList[index].element); + if ( label.length ) { + label.html( + label.html() + .replace("[value]", $element.val()) + .replace("[length]", $element.val().length) + .replace("[field-name]", $element.closest(".form-item").find('label').first().text().replace(' *','')) + ); + } } - } - }; + }; + } } } });