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

luci-base: luci.js: fix undefined "this" when /ubus/ is unavailable

Browse source 
Fixes: #2850
Fixes: 66dfe64ca ("luci-base: luci.js: cache determined RPC base url in session storage")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-07-10 13:30:52 +02:00
parent 1991b4ae64
commit 69e5488c13
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -762,10 +762,12 @@
} }
if (rpcBaseURL == null) { if (rpcBaseURL == null) {
var rpcFallbackURL = this.url('admin/ubus');
rpcBaseURL = Request.get('/ubus/').then(function(res) { rpcBaseURL = Request.get('/ubus/').then(function(res) {
return (rpcBaseURL = (res.status == 400) ? '/ubus/' : this.url('admin/ubus')); return (rpcBaseURL = (res.status == 400) ? '/ubus/' : rpcFallbackURL);
}, function() { }, function() {
return (rpcBaseURL = L.url('admin/ubus')); return (rpcBaseURL = rpcFallbackURL);
}).then(function(url) { }).then(function(url) {
try { try {
window.sessionStorage.setItem('rpcBaseURL', url); window.sessionStorage.setItem('rpcBaseURL', url);