From a8d93fc2a597af60e1cdde8badd221f33097ee21 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Fri, 26 May 2023 11:57:00 +0200 Subject: [PATCH] Made more elegant solution to tools URLs --- Frontend/assets/scripts/frame.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Frontend/assets/scripts/frame.js b/Frontend/assets/scripts/frame.js index 0371186..7601081 100644 --- a/Frontend/assets/scripts/frame.js +++ b/Frontend/assets/scripts/frame.js @@ -32,7 +32,7 @@ function init() { changeActiveTools('XML'); var toolUrl = window.location.search.substring(1); if (tools.has(toolUrl)) - changeTool(toolUrl); + changeTool(toolUrl, false); else loadLastPage(); @@ -73,19 +73,23 @@ function changeActiveTools(activeCategoryButton) { } } + /** - * Function that changes active tool + * This function changes active tool. + * Optional updateURL can be set to false to stop changing URL. + * This helps avoiding endless reload loop when loading page. * * @function * @name changeTool * @kind function * @param {any} tool + * @param {boolean} updateURL? * @returns {void} */ -function changeTool(tool) { +function changeTool(tool, updateURL = true) { if (tools.has(tool)) { const url = tools.get(tool); - document.location.search = tool + "/"; + if (updateURL) document.location.search = tool; localStorage.setItem("lastPage", tool); document.getElementById("iframe").src = url; }