Editor supports alternate configurations correctly

erohtar · Nov 24, 2022 · 620e573 · 620e573
1 parent a5d3d4f
commit 620e573
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 39 deletions.
diff --git a/www/editor.php b/www/editor.php
@@ -14,8 +14,10 @@
 	<link href="include/custom.css" rel="stylesheet">
 	<link rel="icon" href="res/favicon.svg" sizes="32x32" type="image/png">
 
+	<script src="include/preload.js"></script>
 	<script src="include/theming.js"></script>
-    <script src="include/bootstrap.bundle.min.js"></script>
+
+	<script src="include/bootstrap.bundle.min.js"></script>
 	<script src="include/jquery.min.js"></script>
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css">
     
@@ -26,7 +28,7 @@
 	<div class="container col-lg-12 col-xl-10">
 
 		<!-- Container Contents -->
-		<a href="index.php" class="iconButton float-end"><i class="fa-solid fa-server"></i></a>
+		<a href="#" onclick="javascript:settingsFile? window.location = 'index.php?s=' + settingsFile : window.location = 'index.php';" class="iconButton float-end"><i class="fa-solid fa-server"></i></a>
 		
 		<a href="https://github.com/erohtar/Dasherr/" target="_blank" class="iconButton float-end"><i class="fa-brands fa-github"></i></a>
 		

diff --git 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
@@ -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
@@ -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
@@ -21,6 +21,8 @@
 	<script src="include/bootstrap.bundle.min.js"></script>
 	<script src="include/jquery.min.js"></script>
 
+	<!-- theming.js and preload.js need to be loaded before worker.js -->
+	<script src="include/preload.js"></script>
 	<script src="include/theming.js"></script>
 	<script src="include/worker.js"></script>
 
@@ -29,7 +31,7 @@
 	<!-- Window Contents -->
 	<div class="container col-lg-12 col-xl-10" style="display:none">
 
-		<a href="editor.php" class="iconButton float-end"><i class="fa-solid fa-wrench"></i></a>
+		<a href="#" onclick="javascript:settingsFile? window.location = 'editor.php?s=' + settingsFile : window.location = 'editor.php';" class="iconButton float-end"><i class="fa-solid fa-wrench"></i></a>
 
 		<!-- Dashboard Contents -->
 		<div class="row">