TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix naming conflict 

Reported by @alxy https://github.com/octobercms/october/pull/5088#issuecomment-636448210
This commit is contained in:
Luke Towers 2020-05-31 11:23:31 -06:00
parent 5c7ba9fbe9
commit 5c3ba9a28a
21 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/controllers/preferences/index.htm
View File

@ -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')) ?>"

4
modules/backend/controllers/usergroups/create.htm
View File

@ -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')) ?>"

4
modules/backend/controllers/usergroups/update.htm
View File

@ -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')) ?>"

4
modules/backend/controllers/userroles/create.htm
View File

@ -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')) ?>"

4
modules/backend/controllers/userroles/update.htm
View File

@ -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')) ?>"

4
modules/backend/controllers/users/create.htm
View File

@ -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')) ?>"

4
modules/backend/controllers/users/myaccount.htm
View File

@ -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')) ?>"

4
modules/backend/controllers/users/update.htm
View File

@ -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')) ?>"

4
modules/cms/controllers/themeoptions/update.htm
View File

@ -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')) ?>"

4
modules/system/assets/js/framework-min.js vendored
View File

@ -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)}

4
modules/system/assets/js/framework.combined-min.js vendored
View File

@ -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)}

4
modules/system/assets/js/framework.js
View File

@ -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')),

18
modules/system/assets/ui/storm-min.js vendored
View File

@ -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)

2
modules/system/controllers/mailbrandsettings/index.htm
View File

@ -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')) ?>"

4
modules/system/controllers/maillayouts/create.htm
View File

@ -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')) ?>"

4
modules/system/controllers/maillayouts/update.htm
View File

@ -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')) ?>"

4
modules/system/controllers/mailpartials/create.htm
View File

@ -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')) ?>"

4
modules/system/controllers/mailpartials/update.htm
View File

@ -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')) ?>"

4
modules/system/controllers/mailtemplates/create.htm
View File

@ -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')) ?>"

4
modules/system/controllers/mailtemplates/update.htm
View File

@ -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')) ?>"

4
modules/system/controllers/settings/update.htm
View File

@ -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')) ?>"