1bc2c17 — alphons/netproxy

alphons / netproxy

Code Commits Branches Issues Collaborators Settings

bug fixes

alphons <alphons@heijden.com> 30 Nov 2024, 14:37

1bc2c17418218aed0a8c702c32b50be9b1c69e88

2 files changed

src/NetproxySolution.Web/wwwroot/scripts/macros.js
src/NetproxySolution.Web/wwwroot/scripts/netproxy.js

diff --git a/src/NetproxySolution.Web/wwwroot/scripts/macros.js b/src/NetproxySolution.Web/wwwroot/scripts/macros.js
index fac63e9..7046c17 100644
--- a/src/NetproxySolution.Web/wwwroot/scripts/macros.js
+++ b/src/NetproxySolution.Web/wwwroot/scripts/macros.js
@@ -1,9 +1,8 @@
 ﻿// version 1.3 2020-08-30 (C) AAB van der Heijden
-// Updated 2.0 2024-11-22
-// Updated 2.1 2024-11-23
-const $ = document.querySelector.bind(document);
-const $$ = document.querySelectorAll.bind(document);
-const $id = document.getElementById.bind(document);
+// Updated 2.2 2024-11-30
+window.$ = document.querySelector.bind(document);
+window.$$ = document.querySelectorAll.bind(document);
+window.$id = document.getElementById.bind(document);
 
 //onReady(() =>
 //{
diff --git a/src/NetproxySolution.Web/wwwroot/scripts/netproxy.js b/src/NetproxySolution.Web/wwwroot/scripts/netproxy.js
index 55fbd4f..a637c28 100644
--- a/src/NetproxySolution.Web/wwwroot/scripts/netproxy.js
+++ b/src/NetproxySolution.Web/wwwroot/scripts/netproxy.js
@@ -39,7 +39,8 @@
 		const spinner = document.getElementById("netproxyspinner");
 		if (typeof remote !== 'undefined')
 			url = remote + url;
-		var timeoutSpinner = setTimeout(() => spinner.style.display = 'block', 1000);
+		if(spinner)
+			var timeoutSpinner = setTimeout(() => spinner.style.display = 'block', 1000);
 		const xhr = new XMLHttpRequest();
 		xhr.open(data ? 'POST' : 'GET', url, true);
 		xhr.withCredentials = url.indexOf(window.location.host) < 0 && url[0] !== '/';