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

luci-base: luci.js: convert various probe* functions to session data api

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-04-15 22:01:55 +02:00
parent ef718246b1
commit b0c8221926
1 changed files with 9 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2510,12 +2510,8 @@
/* DOM setup */ /* DOM setup */
probeRPCBaseURL: function() { probeRPCBaseURL: function() {
if (rpcBaseURL == null) { if (rpcBaseURL == null)
try { rpcBaseURL = Session.getLocalData('rpcBaseURL');
rpcBaseURL = window.sessionStorage.getItem('rpcBaseURL');
}
catch (e) { }
}
if (rpcBaseURL == null) { if (rpcBaseURL == null) {
var rpcFallbackURL = this.url('admin/ubus'); var rpcFallbackURL = this.url('admin/ubus');
@ -2525,11 +2521,7 @@
}, function() { }, function() {
return (rpcBaseURL = rpcFallbackURL); return (rpcBaseURL = rpcFallbackURL);
}).then(function(url) { }).then(function(url) {
try { Session.setLocalData('rpcBaseURL', url);
window.sessionStorage.setItem('rpcBaseURL', url);
}
catch (e) { }
return url; return url;
}); });
} }
@ -2538,17 +2530,8 @@
}, },
probeSystemFeatures: function() { probeSystemFeatures: function() {
var sessionid = classes.rpc.getSessionID(); if (sysFeatures == null)
sysFeatures = Session.getLocalData('features');
if (sysFeatures == null) {
try {
var data = JSON.parse(window.sessionStorage.getItem('sysFeatures'));
if (this.isObject(data) && this.isObject(data[sessionid]))
sysFeatures = data[sessionid];
}
catch (e) {}
}
if (!this.isObject(sysFeatures)) { if (!this.isObject(sysFeatures)) {
sysFeatures = classes.rpc.declare({ sysFeatures = classes.rpc.declare({
@ -2556,14 +2539,7 @@
method: 'getFeatures', method: 'getFeatures',
expect: { '': {} } expect: { '': {} }
})().then(function(features) { })().then(function(features) {
try { Session.setLocalData('features', features);
var data = {};
data[sessionid] = features;
window.sessionStorage.setItem('sysFeatures', JSON.stringify(data));
}
catch (e) {}
sysFeatures = features; sysFeatures = features;
return features; return features;
@ -2574,17 +2550,8 @@
}, },
probePreloadClasses: function() { probePreloadClasses: function() {
var sessionid = classes.rpc.getSessionID(); if (preloadClasses == null)
preloadClasses = Session.getLocalData('preload');
if (preloadClasses == null) {
try {
var data = JSON.parse(window.sessionStorage.getItem('preloadClasses'));
if (this.isObject(data) && this.isObject(data[sessionid]))
preloadClasses = data[sessionid];
}
catch (e) {}
}
if (!Array.isArray(preloadClasses)) { if (!Array.isArray(preloadClasses)) {
preloadClasses = this.resolveDefault(classes.rpc.declare({ preloadClasses = this.resolveDefault(classes.rpc.declare({
@ -2605,14 +2572,7 @@
classes.push('preload.%s'.format(m[1])); classes.push('preload.%s'.format(m[1]));
} }
try { Session.setLocalData('preload', classes);
var data = {};
data[sessionid] = classes;
window.sessionStorage.setItem('preloadClasses', JSON.stringify(data));
}
catch (e) {}
preloadClasses = classes; preloadClasses = classes;
return classes; return classes;