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

luci-base: cbi.js: fix dropdown and browser initialization

Browse source 
We need to query the dropdowns before initializing dynamic lists but
after initializing combo boxes.

Also fix a copy-paste error from a previous commit.

Fixes: 010102c2c ("luci-base: cbi.js: find dropdown and browser instances early")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-09-10 17:37:42 +02:00
parent 7513a4ca35
commit c0f3e3c6a2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/luci-base/htdocs/luci-static/resources/cbi.js
View file

@ -736,9 +736,7 @@ function cbi_d_update() {
}
function cbi_init() {
var dropdowns = document.querySelectorAll('.cbi-dropdown'),
browsers = document.querySelectorAll('[data-browser]'),
nodes;
var dropdowns, browsers, nodes;
nodes = document.querySelectorAll('[data-strings]');
@ -787,6 +785,9 @@ function cbi_init() {
node.getAttribute('data-manual'));
}
dropdowns = document.querySelectorAll('.cbi-dropdown');
browsers = document.querySelectorAll('[data-browser]');
nodes = document.querySelectorAll('[data-dynlist]');
for (var i = 0, node; (node = nodes[i]) !== undefined; i++) {
@ -811,7 +812,7 @@ function cbi_init() {
}
dropdowns.forEach(cbi_dropdown_init);
browsers.querySelectorAll('[data-browser]').forEach(cbi_browser_init);
browsers.forEach(cbi_browser_init);
document.querySelectorAll('.cbi-tooltip:not(:empty)').forEach(function(s) {
s.parentNode.classList.add('cbi-tooltip-container');