From 2a5940944156e742bc4800e003b24e04d0cb89a0 Mon Sep 17 00:00:00 2001
From: echicken <echicken@bbs.electronicchicken.com>
Date: Wed, 17 Feb 2021 13:45:40 -0500
Subject: [PATCH] Run XJS/SSJS pages & sidebar modules via js.exec.

---
 webv4/lib/pages.js   | 8 ++------
 webv4/lib/sidebar.js | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/webv4/lib/pages.js b/webv4/lib/pages.js
index 6be3eb291e..9a99df8fe2 100644
--- a/webv4/lib/pages.js
+++ b/webv4/lib/pages.js
@@ -218,14 +218,10 @@ function getPage(page) {
 	switch(ext) {
 		case '.SSJS':
 			if (ext === '.SSJS' && p.search(/\.xjs\.ssjs$/i) >= 0) break;
-			(function () {
-				load(p, true);
-			})();
+			js.exec(p, new function () {});
 			break;
 		case '.XJS':
-			(function () {
-				load(xjs_compile(p), true);
-			})();
+			js.exec(xjs_compile(p), new function () {});
 			break;
 		case '.HTML':
 			var f = new File(p);
diff --git a/webv4/lib/sidebar.js b/webv4/lib/sidebar.js
index 30d66e5bea..5c1d93b89f 100644
--- a/webv4/lib/sidebar.js
+++ b/webv4/lib/sidebar.js
@@ -52,14 +52,10 @@ function getSidebarModule(module) {
 	switch (ext) {
 		case '.SSJS':
 			if (ext === '.SSJS' && module.search(/\.xjs\.ssjs$/i) >= 0) break;
-			(function () {
-				load(module, true);
-			})();
+			js.exec(module, new function () {});
 			break;
 		case '.XJS':
-			(function () {
-				load(xjs_compile(module), true);
-			})();
+			js.exec(xjs_compile(module), new function () {});
 			break;
 		case '.HTML':
 			ret = getFileContents(module);
-- 
GitLab