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

luci-base: luci.js: catch base class loading errors

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-04-01 16:36:30 +02:00
parent b839ee87f2
commit 3bc73a7d05
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -431,6 +431,14 @@
LuCI = Class.extend({
__name__: 'LuCI',
__init__: function(env) {
document.querySelectorAll('script[src$="/luci.js"]').forEach(function(s) {
env.base_url = s.getAttribute('src').replace(/\/luci\.js$/, '');
});
if (env.base_url == null)
this.error('InternalError', 'Cannot find url of luci.js');
Object.assign(this.env, env);
document.addEventListener('poll-start', function(ev) {
@ -453,9 +461,7 @@
domReady,
this.require('ui'),
this.require('form')
]).then(this.setupDOM.bind(this)).catch(function(error) {
alert('LuCI class loading error:\n' + error);
});
]).then(this.setupDOM.bind(this)).catch(this.error);
originalCBIInit = window.cbi_init;
window.cbi_init = function() {};
@ -527,15 +533,7 @@
return classes[name];
}
document.querySelectorAll('script[src$="/luci.js"]').forEach(function(s) {
url = '%s/%s.js'.format(
s.getAttribute('src').replace(/\/luci\.js$/, ''),
name.replace(/\./g, '/'));
});
if (url == null)
L.error('InternalError', 'Cannot find url of luci.js');
url = '%s/%s.js'.format(L.env.base_url, name.replace(/\./g, '/'));
from = [ name ].concat(from);
var compileClass = function(res) {