diff --git a/modules/system/assets/ui/js/inspector.validationset.js b/modules/system/assets/ui/js/inspector.validationset.js index 8b80ff33c..ab64b204d 100644 --- a/modules/system/assets/ui/js/inspector.validationset.js +++ b/modules/system/assets/ui/js/inspector.validationset.js @@ -54,12 +54,12 @@ if ((this.options.required !== undefined || this.options.validationPattern !== undefined || - this.options.validationMessage !== undefined) && + this.options.validationMessage !== undefined) && this.options.validation !== undefined) { this.throwError('Legacy and new validation syntax should not be mixed.') } - if (this.options.required !== undefined) { + if (this.options.required !== undefined && this.options.required) { var validator = new $.oc.inspector.validators.required({ message: this.options.validationMessage }) diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js index 9b926e00b..0b7ae2d0e 100644 --- a/modules/system/assets/ui/storm-min.js +++ b/modules/system/assets/ui/storm-min.js @@ -6314,7 +6314,7 @@ BaseProto.dispose.call(this)} ValidationSet.prototype.disposeValidators=function(){for(var i=0,len=this.validators.length;i