From 5c3ba9a28a9e14fbb47d1bf3dc5d60d9d8b1f901 Mon Sep 17 00:00:00 2001
From: Luke Towers <github@luketowers.ca>
Date: Sun, 31 May 2020 11:23:31 -0600
Subject: [PATCH] Fix naming conflict

Reported by @alxy https://github.com/octobercms/october/pull/5088#issuecomment-636448210
---
 .../backend/controllers/preferences/index.htm  |  2 +-
 .../backend/controllers/usergroups/create.htm  |  4 ++--
 .../backend/controllers/usergroups/update.htm  |  4 ++--
 .../backend/controllers/userroles/create.htm   |  4 ++--
 .../backend/controllers/userroles/update.htm   |  4 ++--
 modules/backend/controllers/users/create.htm   |  4 ++--
 .../backend/controllers/users/myaccount.htm    |  4 ++--
 modules/backend/controllers/users/update.htm   |  4 ++--
 .../cms/controllers/themeoptions/update.htm    |  4 ++--
 modules/system/assets/js/framework-min.js      |  4 ++--
 .../system/assets/js/framework.combined-min.js |  4 ++--
 modules/system/assets/js/framework.js          |  4 ++--
 modules/system/assets/ui/storm-min.js          | 18 +++++++++++++-----
 .../controllers/mailbrandsettings/index.htm    |  2 +-
 .../system/controllers/maillayouts/create.htm  |  4 ++--
 .../system/controllers/maillayouts/update.htm  |  4 ++--
 .../system/controllers/mailpartials/create.htm |  4 ++--
 .../system/controllers/mailpartials/update.htm |  4 ++--
 .../controllers/mailtemplates/create.htm       |  4 ++--
 .../controllers/mailtemplates/update.htm       |  4 ++--
 modules/system/controllers/settings/update.htm |  4 ++--
 21 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/modules/backend/controllers/preferences/index.htm b/modules/backend/controllers/preferences/index.htm
index 0183afddf..1266aba63 100644
--- a/modules/backend/controllers/preferences/index.htm
+++ b/modules/backend/controllers/preferences/index.htm
@@ -11,7 +11,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
diff --git a/modules/backend/controllers/usergroups/create.htm b/modules/backend/controllers/usergroups/create.htm
index 695ae69f3..34012411f 100644
--- a/modules/backend/controllers/usergroups/create.htm
+++ b/modules/backend/controllers/usergroups/create.htm
@@ -19,7 +19,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
@@ -28,7 +28,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
diff --git a/modules/backend/controllers/usergroups/update.htm b/modules/backend/controllers/usergroups/update.htm
index 54e64a65b..9efd8e6c2 100644
--- a/modules/backend/controllers/usergroups/update.htm
+++ b/modules/backend/controllers/usergroups/update.htm
@@ -19,7 +19,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
@@ -29,7 +29,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
diff --git a/modules/backend/controllers/userroles/create.htm b/modules/backend/controllers/userroles/create.htm
index a4e2b037d..0ba5e3099 100644
--- a/modules/backend/controllers/userroles/create.htm
+++ b/modules/backend/controllers/userroles/create.htm
@@ -19,7 +19,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
@@ -28,7 +28,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
diff --git a/modules/backend/controllers/userroles/update.htm b/modules/backend/controllers/userroles/update.htm
index a695862b1..6b19f3dfa 100644
--- a/modules/backend/controllers/userroles/update.htm
+++ b/modules/backend/controllers/userroles/update.htm
@@ -19,7 +19,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
@@ -29,7 +29,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
diff --git a/modules/backend/controllers/users/create.htm b/modules/backend/controllers/users/create.htm
index eecc783c3..3197f4907 100644
--- a/modules/backend/controllers/users/create.htm
+++ b/modules/backend/controllers/users/create.htm
@@ -20,7 +20,7 @@
                     <button
                         type="submit"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-hotkey="ctrl+s, cmd+s"
                         data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                         class="btn btn-primary">
@@ -29,7 +29,7 @@
                     <button
                         type="button"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
                         data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
diff --git a/modules/backend/controllers/users/myaccount.htm b/modules/backend/controllers/users/myaccount.htm
index 29b820a11..ff70c54cb 100644
--- a/modules/backend/controllers/users/myaccount.htm
+++ b/modules/backend/controllers/users/myaccount.htm
@@ -22,7 +22,7 @@
                     <button
                         type="submit"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-request-data="redirect:0"
                         data-hotkey="ctrl+s, cmd+s"
                         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
@@ -33,7 +33,7 @@
                         <button
                             type="button"
                             data-request="onSave"
-                            data-request-validate
+                            data-browser-validate
                             data-request-data="close:1"
                             data-hotkey="ctrl+enter, cmd+enter"
                             data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
diff --git a/modules/backend/controllers/users/update.htm b/modules/backend/controllers/users/update.htm
index 9cef82324..e299fde2f 100644
--- a/modules/backend/controllers/users/update.htm
+++ b/modules/backend/controllers/users/update.htm
@@ -24,7 +24,7 @@
                     <button
                         type="submit"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-request-data="redirect:0"
                         data-hotkey="ctrl+s, cmd+s"
                         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
@@ -34,7 +34,7 @@
                     <button
                         type="button"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
                         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
diff --git a/modules/cms/controllers/themeoptions/update.htm b/modules/cms/controllers/themeoptions/update.htm
index 8983d1516..4bc7b58c9 100644
--- a/modules/cms/controllers/themeoptions/update.htm
+++ b/modules/cms/controllers/themeoptions/update.htm
@@ -19,7 +19,7 @@
                     <button
                         type="submit"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-request-data="redirect:0"
                         data-hotkey="ctrl+s, cmd+s"
                         data-load-indicator="<?= e(trans('cms::lang.theme.saving')) ?>"
@@ -29,7 +29,7 @@
                     <button
                         type="button"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
                         data-load-indicator="<?= e(trans('cms::lang.theme.saving')) ?>"
diff --git a/modules/system/assets/js/framework-min.js b/modules/system/assets/js/framework-min.js
index 866e83dd5..d5ff8234b 100644
--- a/modules/system/assets/js/framework-min.js
+++ b/modules/system/assets/js/framework-min.js
@@ -4,7 +4,7 @@ if(window.jQuery.request!==undefined){throw new Error('The OctoberCMS framework
 +function($){"use strict";var Request=function(element,handler,options){var $el=this.$el=$(element);this.options=options||{};if(handler===undefined){throw new Error('The request handler name is not specified.')}
 if(!handler.match(/^(?:\w+\:{2})?on*/)){throw new Error('Invalid handler name. The correct handler name format is: "onEvent".')}
 var $form=options.form?$(options.form):$el.closest('form'),$triggerEl=!!$form.length?$form:$el,context={handler:handler,options:options}
-if((options.validate!==undefined)&&typeof document.createElement('input').reportValidity=='function'&&$form&&$form[0]&&!$form[0].checkValidity()){$form[0].reportValidity();return false;}
+if((options.browserValidate!==undefined)&&typeof document.createElement('input').reportValidity=='function'&&$form&&$form[0]&&!$form[0].checkValidity()){$form[0].reportValidity();return false;}
 $el.trigger('ajaxSetup',[context])
 var _event=jQuery.Event('oc.beforeRequest')
 $triggerEl.trigger(_event,context)
@@ -103,7 +103,7 @@ return result.join('&')}
 var old=$.fn.request
 $.fn.request=function(handler,option){var args=arguments
 var $this=$(this).first()
-var data={evalBeforeUpdate:$this.data('request-before-update'),evalSuccess:$this.data('request-success'),evalError:$this.data('request-error'),evalComplete:$this.data('request-complete'),ajaxGlobal:$this.data('request-ajax-global'),confirm:$this.data('request-confirm'),redirect:$this.data('request-redirect'),loading:$this.data('request-loading'),flash:$this.data('request-flash'),files:$this.data('request-files'),validate:$this.data('request-validate'),form:$this.data('request-form'),url:$this.data('request-url'),update:paramToObj('data-request-update',$this.data('request-update')),data:paramToObj('data-request-data',$this.data('request-data'))}
+var data={evalBeforeUpdate:$this.data('request-before-update'),evalSuccess:$this.data('request-success'),evalError:$this.data('request-error'),evalComplete:$this.data('request-complete'),ajaxGlobal:$this.data('request-ajax-global'),confirm:$this.data('request-confirm'),redirect:$this.data('request-redirect'),loading:$this.data('request-loading'),flash:$this.data('request-flash'),files:$this.data('request-files'),browserValidate:$this.data('browser-validate'),form:$this.data('request-form'),url:$this.data('request-url'),update:paramToObj('data-request-update',$this.data('request-update')),data:paramToObj('data-request-data',$this.data('request-data'))}
 if(!handler)handler=$this.data('request')
 var options=$.extend(true,{},Request.DEFAULTS,data,typeof option=='object'&&option)
 return new Request($this,handler,options)}
diff --git a/modules/system/assets/js/framework.combined-min.js b/modules/system/assets/js/framework.combined-min.js
index b8eef5183..52c68980d 100644
--- a/modules/system/assets/js/framework.combined-min.js
+++ b/modules/system/assets/js/framework.combined-min.js
@@ -4,7 +4,7 @@ if(window.jQuery.request!==undefined){throw new Error('The OctoberCMS framework
 +function($){"use strict";var Request=function(element,handler,options){var $el=this.$el=$(element);this.options=options||{};if(handler===undefined){throw new Error('The request handler name is not specified.')}
 if(!handler.match(/^(?:\w+\:{2})?on*/)){throw new Error('Invalid handler name. The correct handler name format is: "onEvent".')}
 var $form=options.form?$(options.form):$el.closest('form'),$triggerEl=!!$form.length?$form:$el,context={handler:handler,options:options}
-if((options.validate!==undefined)&&typeof document.createElement('input').reportValidity=='function'&&$form&&$form[0]&&!$form[0].checkValidity()){$form[0].reportValidity();return false;}
+if((options.browserValidate!==undefined)&&typeof document.createElement('input').reportValidity=='function'&&$form&&$form[0]&&!$form[0].checkValidity()){$form[0].reportValidity();return false;}
 $el.trigger('ajaxSetup',[context])
 var _event=jQuery.Event('oc.beforeRequest')
 $triggerEl.trigger(_event,context)
@@ -103,7 +103,7 @@ return result.join('&')}
 var old=$.fn.request
 $.fn.request=function(handler,option){var args=arguments
 var $this=$(this).first()
-var data={evalBeforeUpdate:$this.data('request-before-update'),evalSuccess:$this.data('request-success'),evalError:$this.data('request-error'),evalComplete:$this.data('request-complete'),ajaxGlobal:$this.data('request-ajax-global'),confirm:$this.data('request-confirm'),redirect:$this.data('request-redirect'),loading:$this.data('request-loading'),flash:$this.data('request-flash'),files:$this.data('request-files'),validate:$this.data('request-validate'),form:$this.data('request-form'),url:$this.data('request-url'),update:paramToObj('data-request-update',$this.data('request-update')),data:paramToObj('data-request-data',$this.data('request-data'))}
+var data={evalBeforeUpdate:$this.data('request-before-update'),evalSuccess:$this.data('request-success'),evalError:$this.data('request-error'),evalComplete:$this.data('request-complete'),ajaxGlobal:$this.data('request-ajax-global'),confirm:$this.data('request-confirm'),redirect:$this.data('request-redirect'),loading:$this.data('request-loading'),flash:$this.data('request-flash'),files:$this.data('request-files'),browserValidate:$this.data('browser-validate'),form:$this.data('request-form'),url:$this.data('request-url'),update:paramToObj('data-request-update',$this.data('request-update')),data:paramToObj('data-request-data',$this.data('request-data'))}
 if(!handler)handler=$this.data('request')
 var options=$.extend(true,{},Request.DEFAULTS,data,typeof option=='object'&&option)
 return new Request($this,handler,options)}
diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index 448a89500..6a6723ec7 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -39,7 +39,7 @@ if (window.jQuery.request !== undefined) {
         /*
          * Validate the form client-side
          */
-        if ((options.validate !== undefined) && typeof document.createElement('input').reportValidity == 'function' && $form && $form[0] && !$form[0].checkValidity()) {
+        if ((options.browserValidate !== undefined) && typeof document.createElement('input').reportValidity == 'function' && $form && $form[0] && !$form[0].checkValidity()) {
             $form[0].reportValidity();
             return false;
         }
@@ -446,7 +446,7 @@ if (window.jQuery.request !== undefined) {
             loading: $this.data('request-loading'),
             flash: $this.data('request-flash'),
             files: $this.data('request-files'),
-            validate: $this.data('request-validate'),
+            browserValidate: $this.data('browser-validate'),
             form: $this.data('request-form'),
             url: $this.data('request-url'),
             update: paramToObj('data-request-update', $this.data('request-update')),
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index c746a6487..a7bd3a056 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -4959,6 +4959,11 @@ while(current){if(current.propertyName){result.push(current.propertyName)}
 current=current.parentSurface}
 result.reverse()
 return result.join('.')}
+Surface.prototype.findDependentProperties=function(propertyName){var dependents=[]
+for(var i in this.rawProperties){var property=this.rawProperties[i]
+if(!property.depends){continue}
+if(property.depends.indexOf(propertyName)!==-1){dependents.push(property.property)}}
+return dependents}
 Surface.prototype.mergeChildSurface=function(surface,mergeAfterRow){var rows=surface.tableContainer.querySelectorAll('table.inspector-fields > tbody > tr')
 surface.tableContainer=this.getRootSurface().tableContainer
 for(var i=rows.length-1;i>=0;i--){var row=rows[i]
@@ -5631,6 +5636,7 @@ select.appendChild(option)}
 DropdownEditor.prototype.createOptions=function(select,options){for(var value in options){this.createOption(select,options[value],value)}}
 DropdownEditor.prototype.initCustomSelect=function(){var select=this.getSelect()
 var options={dropdownCssClass:'ocInspectorDropdown'}
+if(this.propertyDefinition.emptyOption!==undefined){options.placeholder=this.propertyDefinition.emptyOption}
 if(this.propertyDefinition.placeholder!==undefined){options.placeholder=this.propertyDefinition.placeholder}
 options.templateResult=this.formatSelectOption
 options.templateSelection=this.formatSelectOption
@@ -5638,7 +5644,7 @@ options.escapeMarkup=function(m){return m}
 $(select).select2(options)
 if(!Modernizr.touchevents){this.indicatorContainer=$('.select2-container',this.containerCell)
 this.indicatorContainer.addClass('loading-indicator-container size-small')}}
-DropdownEditor.prototype.createPlaceholder=function(select){var placeholder=this.propertyDefinition.placeholder
+DropdownEditor.prototype.createPlaceholder=function(select){var placeholder=this.propertyDefinition.placeholder||this.propertyDefinition.emptyOption
 if(placeholder!==undefined&&!Modernizr.touchevents){this.createOption(select,null,null)}
 if(placeholder!==undefined&&Modernizr.touchevents){this.createOption(select,placeholder,null)}}
 DropdownEditor.prototype.getSelect=function(){return this.containerCell.querySelector('select')}
@@ -5655,7 +5661,7 @@ DropdownEditor.prototype.registerHandlers=function(){var select=this.getSelect()
 $(select).on('change',this.proxy(this.onSelectionChange))}
 DropdownEditor.prototype.onSelectionChange=function(){var select=this.getSelect()
 this.inspector.setPropertyValue(this.propertyDefinition.property,this.normalizeValue(select.value),this.initialization)}
-DropdownEditor.prototype.onInspectorPropertyChanged=function(property,value){if(!this.propertyDefinition.depends||this.propertyDefinition.depends.indexOf(property)===-1){return}
+DropdownEditor.prototype.onInspectorPropertyChanged=function(property){if(!this.propertyDefinition.depends||this.propertyDefinition.depends.indexOf(property)===-1){return}
 var dependencyValues=this.getDependencyValues()
 if(this.prevDependencyValues===undefined||this.prevDependencyValues!=dependencyValues){this.loadDynamicOptions()}}
 DropdownEditor.prototype.onExternalPropertyEditorHidden=function(){if(this.dynamicOptions){this.loadDynamicOptions(false)}}
@@ -5678,10 +5684,12 @@ this.createPlaceholder(select)
 this.createOptions(select,this.propertyDefinition.options)
 if(value===undefined){value=this.propertyDefinition.default}
 select.value=value}
-DropdownEditor.prototype.loadDynamicOptions=function(initialization){var currentValue=this.inspector.getPropertyValue(this.propertyDefinition.property),data=this.getRootSurface().getValues(),self=this,$form=$(this.getSelect()).closest('form')
+DropdownEditor.prototype.loadDynamicOptions=function(initialization){var currentValue=this.inspector.getPropertyValue(this.propertyDefinition.property),data=this.getRootSurface().getValues(),self=this,$form=$(this.getSelect()).closest('form'),dependents=this.inspector.findDependentProperties(this.propertyDefinition.property)
 if(currentValue===undefined){currentValue=this.propertyDefinition.default}
 var callback=function dropdownOptionsRequestDoneClosure(data){self.hideLoadingIndicator()
-self.optionsRequestDone(data,currentValue,true)}
+self.optionsRequestDone(data,currentValue,true)
+if(dependents.length>0){for(var i in dependents){var editor=self.inspector.findPropertyEditor(dependents[i])
+if(editor&&typeof editor.onInspectorPropertyChanged==='function'){editor.onInspectorPropertyChanged(self.propertyDefinition.property)}}}}
 if(this.propertyDefinition.depends){this.saveDependencyValues()}
 data['inspectorProperty']=this.getPropertyPath()
 data['inspectorClassName']=this.inspector.options.inspectorClass
@@ -6626,7 +6634,7 @@ for(var i=0,len=this.propertyDefinition.depends.length;i<len;i++){var property=t
 if(value===undefined){value='';}
 result+=property+':'+value+'-'}
 return result}
-AutocompleteEditor.prototype.onInspectorPropertyChanged=function(property,value){if(!this.propertyDefinition.depends||this.propertyDefinition.depends.indexOf(property)===-1){return}
+AutocompleteEditor.prototype.onInspectorPropertyChanged=function(property){if(!this.propertyDefinition.depends||this.propertyDefinition.depends.indexOf(property)===-1){return}
 this.clearAutoUpdateTimeout()
 if(this.prevDependencyValues===undefined||this.prevDependencyValues!=dependencyValues){this.autoUpdateTimeout=setTimeout(this.proxy(this.loadDynamicItems),200)}}
 AutocompleteEditor.prototype.clearAutoUpdateTimeout=function(){if(this.autoUpdateTimeout!==null){clearTimeout(this.autoUpdateTimeout)
diff --git a/modules/system/controllers/mailbrandsettings/index.htm b/modules/system/controllers/mailbrandsettings/index.htm
index c79e4ad1c..bdc65bc9d 100644
--- a/modules/system/controllers/mailbrandsettings/index.htm
+++ b/modules/system/controllers/mailbrandsettings/index.htm
@@ -19,7 +19,7 @@
                     <button
                         type="submit"
                         data-request="onSave"
-                        data-request-validate
+                        data-browser-validate
                         data-request-data="redirect:0"
                         data-hotkey="ctrl+s, cmd+s"
                         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
diff --git a/modules/system/controllers/maillayouts/create.htm b/modules/system/controllers/maillayouts/create.htm
index fe0038299..fcde00a9d 100644
--- a/modules/system/controllers/maillayouts/create.htm
+++ b/modules/system/controllers/maillayouts/create.htm
@@ -18,7 +18,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_layout')) ?>"
                     class="btn btn-primary">
@@ -27,7 +27,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_layout')) ?>"
diff --git a/modules/system/controllers/maillayouts/update.htm b/modules/system/controllers/maillayouts/update.htm
index 4bc19c56c..a7989f000 100644
--- a/modules/system/controllers/maillayouts/update.htm
+++ b/modules/system/controllers/maillayouts/update.htm
@@ -29,7 +29,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.saving_layout')) ?>"
@@ -39,7 +39,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.saving_layout')) ?>"
diff --git a/modules/system/controllers/mailpartials/create.htm b/modules/system/controllers/mailpartials/create.htm
index c7ae2f4a0..78942e0c1 100644
--- a/modules/system/controllers/mailpartials/create.htm
+++ b/modules/system/controllers/mailpartials/create.htm
@@ -18,7 +18,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_partial')) ?>"
                     class="btn btn-primary">
@@ -27,7 +27,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_partial')) ?>"
diff --git a/modules/system/controllers/mailpartials/update.htm b/modules/system/controllers/mailpartials/update.htm
index 0d7c702bd..6e1e24bd7 100644
--- a/modules/system/controllers/mailpartials/update.htm
+++ b/modules/system/controllers/mailpartials/update.htm
@@ -29,7 +29,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.saving_layout')) ?>"
@@ -39,7 +39,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.saving_layout')) ?>"
diff --git a/modules/system/controllers/mailtemplates/create.htm b/modules/system/controllers/mailtemplates/create.htm
index b3d320dbb..19995235a 100644
--- a/modules/system/controllers/mailtemplates/create.htm
+++ b/modules/system/controllers/mailtemplates/create.htm
@@ -18,7 +18,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.creating')) ?>"
                     class="btn btn-primary">
@@ -27,7 +27,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.creating')) ?>"
diff --git a/modules/system/controllers/mailtemplates/update.htm b/modules/system/controllers/mailtemplates/update.htm
index 917ce6217..eda5dcb45 100644
--- a/modules/system/controllers/mailtemplates/update.htm
+++ b/modules/system/controllers/mailtemplates/update.htm
@@ -29,7 +29,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.saving')) ?>"
@@ -39,7 +39,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('system::lang.mail_templates.saving')) ?>"
diff --git a/modules/system/controllers/settings/update.htm b/modules/system/controllers/settings/update.htm
index 7b16e9ba7..64f63117a 100644
--- a/modules/system/controllers/settings/update.htm
+++ b/modules/system/controllers/settings/update.htm
@@ -11,7 +11,7 @@
                 <button
                     type="submit"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
@@ -21,7 +21,7 @@
                 <button
                     type="button"
                     data-request="onSave"
-                    data-request-validate
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"