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

luci-base: use native ubus HTTP gateway if available

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-07-08 17:39:24 +02:00
parent acbc031a6d
commit 006f7c7932
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,7 +579,9 @@
Promise.all([ Promise.all([
domReady, domReady,
this.require('ui'), this.require('ui'),
this.require('form') this.require('rpc'),
this.require('form'),
Request.get('/ubus/').catch(function() { return { status: 0 } })
]).then(this.setupDOM.bind(this)).catch(this.error); ]).then(this.setupDOM.bind(this)).catch(this.error);
originalCBIInit = window.cbi_init; originalCBIInit = window.cbi_init;
@ -752,7 +754,16 @@
}, },
/* DOM setup */ /* DOM setup */
setupDOM: function(ev) { setupDOM: function(res) {
var domEv = res[0],
uiClass = res[1],
rpcClass = res[2],
formClass = res[3],
ubusReply = res[4];
if (ubusReply.status == 400)
rpcClass.setBaseURL('/ubus/');
Request.addInterceptor(function(res) { Request.addInterceptor(function(res) {
if (res.status != 403 || res.headers.get('X-LuCI-Login-Required') != 'yes') if (res.status != 403 || res.headers.get('X-LuCI-Login-Required') != 'yes')
return; return;