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

luci-base: fix loading fold.gif for filebrowser

Browse source 
cbi_init() needs to be called at the end of the page to initialize
cbi_strings with "[data-strings]" while cbi_browser_init() happened
before that.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2017-07-21 20:09:43 +08:00
parent 2224714217
commit c759500d49
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -727,7 +727,7 @@ function cbi_filebrowser(id, defpath) {
browser.focus(); browser.focus();
} }
function cbi_browser_init(id, defpath) function cbi_browser_init(id, resource, defpath)
{ {
function cbi_browser_btnclick(e) { function cbi_browser_btnclick(e) {
cbi_filebrowser(id, defpath); cbi_filebrowser(id, defpath);
@ -738,7 +738,7 @@ function cbi_browser_init(id, defpath)
var btn = document.createElement('img'); var btn = document.createElement('img');
btn.className = 'cbi-image-button'; btn.className = 'cbi-image-button';
btn.src = cbi_strings.path.resource + '/cbi/folder.gif'; btn.src = (resource || cbi_strings.path.resource) + '/cbi/folder.gif';
field.parentNode.insertBefore(btn, field.nextSibling); field.parentNode.insertBefore(btn, field.nextSibling);
cbi_bind(btn, 'click', cbi_browser_btnclick); cbi_bind(btn, 'click', cbi_browser_btnclick);
@ -805,7 +805,7 @@ function cbi_dynlist_init(parent, datatype, optional, choices)
parent.appendChild(b); parent.appendChild(b);
if (datatype == 'file') if (datatype == 'file')
{ {
cbi_browser_init(t.id, parent.getAttribute('data-browser-path')); cbi_browser_init(t.id, null, parent.getAttribute('data-browser-path'));
} }
parent.appendChild(document.createElement('br')); parent.appendChild(document.createElement('br'));