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

luci-base: ui.js: use common fs.js class for filebrowser operations

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-10-02 19:42:48 +02:00
parent 8776e423d9
commit df8078d542
1 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
'require rpc'; 'require rpc';
'require uci'; 'require uci';
'require validation'; 'require validation';
'require fs';
var modalDiv = null, var modalDiv = null,
tooltipDiv = null, tooltipDiv = null,
@ -1470,26 +1471,6 @@ var UIFileUpload = UIElement.extend({
}, options); }, options);
}, },
callFileStat: rpc.declare({
'object': 'file',
'method': 'stat',
'params': [ 'path' ],
'expect': { '': {} }
}),
callFileList: rpc.declare({
'object': 'file',
'method': 'list',
'params': [ 'path' ],
'expect': { 'entries': [] }
}),
callFileRemove: rpc.declare({
'object': 'file',
'method': 'remove',
'params': [ 'path' ]
}),
bind: function(browserEl) { bind: function(browserEl) {
this.node = browserEl; this.node = browserEl;
@ -1502,7 +1483,7 @@ var UIFileUpload = UIElement.extend({
}, },
render: function() { render: function() {
return Promise.resolve(this.value != null ? this.callFileStat(this.value) : null).then(L.bind(function(stat) { return L.resolveDefault(this.value != null ? fs.stat(this.value) : null).then(L.bind(function(stat) {
var label; var label;
if (L.isObject(stat) && stat.type != 'directory') if (L.isObject(stat) && stat.type != 'directory')
@ -1647,15 +1628,11 @@ var UIFileUpload = UIElement.extend({
hidden.value = ''; hidden.value = '';
} }
return this.callFileRemove(path).then(L.bind(function(parent, ev, rc) { return fs.remove(path).then(L.bind(function(parent, ev) {
if (rc == 0)
return this.handleSelect(parent, null, ev); return this.handleSelect(parent, null, ev);
else if (rc == 6) }, this, parent, ev)).catch(function(err) {
alert(_('Delete permission denied')); alert(_('Delete request failed: %s').format(err.message));
else });
alert(_('Delete request failed: %d %s').format(rc, rpc.getStatusText(rc)));
}, this, parent, ev));
} }
}, },
@ -1817,7 +1794,7 @@ var UIFileUpload = UIElement.extend({
if (fileStat == null) { if (fileStat == null) {
L.dom.content(ul, E('em', { 'class': 'spinning' }, _('Loading directory contents…'))); L.dom.content(ul, E('em', { 'class': 'spinning' }, _('Loading directory contents…')));
this.callFileList(path).then(L.bind(this.renderListing, this, browser, path)); L.resolveDefault(fs.list(path), []).then(L.bind(this.renderListing, this, browser, path));
} }
else { else {
var button = this.node.firstElementChild, var button = this.node.firstElementChild,
@ -1849,7 +1826,7 @@ var UIFileUpload = UIElement.extend({
ev.preventDefault(); ev.preventDefault();
return this.callFileList(path).then(L.bind(function(button, browser, path, list) { return L.resolveDefault(fs.list(path), []).then(L.bind(function(button, browser, path, list) {
document.querySelectorAll('.cbi-filebrowser.open').forEach(function(browserEl) { document.querySelectorAll('.cbi-filebrowser.open').forEach(function(browserEl) {
L.dom.findClassInstance(browserEl).handleCancel(ev); L.dom.findClassInstance(browserEl).handleCancel(ev);
}); });