Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: ui.js: allow custom validation in Dropdown and DynamicList

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-12-16 17:44:27 +01:00
parent f6410361c8
commit 90a161018c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/luci-base/htdocs/luci-static/resources/ui.js
View file

@ -457,9 +457,9 @@ var UIDropdown = UIElement.extend({
'placeholder': this.options.custom_placeholder || this.options.placeholder 'placeholder': this.options.custom_placeholder || this.options.placeholder
}); });
if (this.options.datatype) if (this.options.datatype || this.options.validate)
L.ui.addValidator(createEl, this.options.datatype, L.ui.addValidator(createEl, this.options.datatype || 'string',
true, null, 'blur', 'keyup'); true, this.options.validate, 'blur', 'keyup');
sb.lastElementChild.appendChild(E('li', { 'data-value': '-' }, createEl)); sb.lastElementChild.appendChild(E('li', { 'data-value': '-' }, createEl));
} }
@ -1270,9 +1270,9 @@ var UIDynamicList = UIElement.extend({
dl.lastElementChild.appendChild(inputEl); dl.lastElementChild.appendChild(inputEl);
dl.lastElementChild.appendChild(E('div', { 'class': 'cbi-button cbi-button-add' }, '+')); dl.lastElementChild.appendChild(E('div', { 'class': 'cbi-button cbi-button-add' }, '+'));
if (this.options.datatype) if (this.options.datatype || this.options.validate)
L.ui.addValidator(inputEl, this.options.datatype, L.ui.addValidator(inputEl, this.options.datatype || 'string',
true, null, 'blur', 'keyup'); true, this.options.validate, 'blur', 'keyup');
} }
for (var i = 0; i < this.values.length; i++) for (var i = 0; i < this.values.length; i++)