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

luci-base: luci.js: handle postprocessed sources

Browse source 
- Fix discovering base url if cache buster is appended to luci.js href
 - Fix extracting require tokens in minified sources

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-04-02 17:21:58 +02:00
parent 675824e377
commit 74ccea6fa2
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,8 +432,9 @@
__name__: 'LuCI', __name__: 'LuCI',
__init__: function(env) { __init__: function(env) {
document.querySelectorAll('script[src$="/luci.js"]').forEach(function(s) { document.querySelectorAll('script[src*="/luci.js"]').forEach(function(s) {
env.base_url = s.getAttribute('src').replace(/\/luci\.js$/, ''); if (env.base_url == null || env.base_url == '')
env.base_url = s.getAttribute('src').replace(/\/luci\.js(?:\?v=[^?]+)?$/, '');
}); });
if (env.base_url == null) if (env.base_url == null)
@ -542,15 +543,41 @@
'HTTP error %d while loading class file "%s"', res.status, url); 'HTTP error %d while loading class file "%s"', res.status, url);
var source = res.text(), var source = res.text(),
reqmatch = /(?:^|\n)[ \t]*(?:["']require[ \t]+(\S+)(?:[ \t]+as[ \t]+([a-zA-Z_]\S*))?["']);/g, requirematch = /^require[ \t]+(\S+)(?:[ \t]+as[ \t]+([a-zA-Z_]\S*))?$/,
strictmatch = /^use[ \t]+strict$/,
depends = [], depends = [],
args = ''; args = '';
/* find require statements in source */ /* find require statements in source */
for (var m = reqmatch.exec(source); m; m = reqmatch.exec(source)) { for (var i = 0, off = -1, quote = -1, esc = false; i < source.length; i++) {
var dep = m[1], as = m[2] || dep.replace(/[^a-zA-Z0-9_]/g, '_'); var chr = source.charCodeAt(i);
depends.push(L.require(dep, from));
args += ', ' + as; if (esc) {
esc = false;
}
else if (chr == 92) {
esc = true;
}
else if (chr == quote) {
var s = source.substring(off, i),
m = requirematch.exec(s);
if (m) {
var dep = m[1], as = m[2] || dep.replace(/[^a-zA-Z0-9_]/g, '_');
depends.push(L.require(dep, from));
args += ', ' + as;
}
else if (!strictmatch.exec(s)) {
break;
}
off = -1;
quote = -1;
}
else if (quote == -1 && (chr == 34 || chr == 39)) {
off = i + 1;
quote = chr;
}
} }
/* load dependencies and instantiate class */ /* load dependencies and instantiate class */