-
+
diff --git a/www/include/editor.js b/www/include/editor.js
index 52789de..504d40f 100644
--- a/www/include/editor.js
+++ b/www/include/editor.js
@@ -1,25 +1,17 @@
//globals
-var gSettings = JSON.parse(fileReader("settings.json"));
-var currTheme = gSettings.themes[gSettings.page.theme];
//load file
const editor = new JsonEditor('#json-display', readSettingsJson());
editor.load(readSettingsJson());
applyTheme();
-function fileReader(pathOfFileToReadFrom)
-{
- var request = new XMLHttpRequest();
- request.open("GET", pathOfFileToReadFrom, false);
- request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
- request.setRequestHeader("Access-Control-Allow-Origin", "*");
- request.send(null);
- return request.responseText;
-}
function readSettingsJson() {
try {
- return JSON.parse(fileReader('settings.json'));
+ if (settingsFile)
+ return JSON.parse(fileReader(settingsFile));
+ else
+ return JSON.parse(fileReader('settings.json'));
} catch (ex) {
alert('Wrong JSON Format: ' + ex);
}
diff --git a/www/include/preload.js b/www/include/preload.js
new file mode 100644
index 0000000..a3ccf96
--- /dev/null
+++ b/www/include/preload.js
@@ -0,0 +1,17 @@
+//support for alt settings file (default being settings.json)
+const urlParams = new URLSearchParams(window.location.search);
+let settingsFile = urlParams.get('s');
+
+const gSettings = settingsFile ? JSON.parse(fileReader(settingsFile)) : JSON.parse(fileReader('settings.json'));
+
+const currTheme = gSettings.themes[gSettings.page.theme];
+
+function fileReader(pathOfFileToReadFrom)
+{
+ var request = new XMLHttpRequest();
+ request.open("GET", pathOfFileToReadFrom, false);
+ request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+ request.setRequestHeader("Access-Control-Allow-Origin", "*");
+ request.send(null);
+ return request.responseText;
+}
diff --git a/www/include/worker.js b/www/include/worker.js
index bd3f990..a80634a 100644
--- a/www/include/worker.js
+++ b/www/include/worker.js
@@ -1,17 +1,7 @@
-//globals
+//define global vars
-//support for alt settings file (default being settings.json)
-const urlParams = new URLSearchParams(window.location.search);
-let settingsFile = urlParams.get('s')
-
-if (!settingsFile)
- settingsFile = 'settings.json';
-
-const gSettings = JSON.parse(fileReader(settingsFile));
-const currTheme = gSettings.themes[gSettings.page.theme];
let enableTooltips = false;
-
window.onload = function() {
//show page contents at this point
document.getElementsByClassName('container')[0].style = 'display:block;';
@@ -72,19 +62,6 @@ window.onload = function() {
}
};
-//to read settings file
-function fileReader(pathOfFileToReadFrom)
-{
- let request = new XMLHttpRequest();
- request.open('GET', pathOfFileToReadFrom, false);
- request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
- request.setRequestHeader('Access-Control-Allow-Origin', '*');
- request.send(null);
- let returnValue = request.responseText;
-
- return returnValue;
-}
-
//widget refresh functions
function glances() {
diff --git a/www/index.php b/www/index.php
index dd8d74e..43d7935 100644
--- a/www/index.php
+++ b/www/index.php
@@ -21,6 +21,8 @@
+
+
@@ -29,7 +31,7 @@