From 6058169818370658ea63ac40375264e7ad8c9c42 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Fri, 26 May 2023 11:39:57 +0200 Subject: [PATCH] Solved #180 and one other bug (#210) I found and fixed bug: When in URL query was put without # at the end the page would start reloading indefinitely Co-authored-by: Adam Bem Reviewed-on: https://gitea.release11.com/R11/release11-tools/pulls/210 Reviewed-by: Mikolaj Widla --- Frontend/assets/css/tools/mock/r11tool.css | 1 + Frontend/assets/scripts/frame.js | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Frontend/assets/css/tools/mock/r11tool.css b/Frontend/assets/css/tools/mock/r11tool.css index 9368b0b..ad7fed0 100644 --- a/Frontend/assets/css/tools/mock/r11tool.css +++ b/Frontend/assets/css/tools/mock/r11tool.css @@ -21,6 +21,7 @@ input { border: 2px solid rgba(93, 99, 96, 0.705); border-radius: 5px; padding: 8px; + display: block; } diff --git a/Frontend/assets/scripts/frame.js b/Frontend/assets/scripts/frame.js index 3e2e867..0371186 100644 --- a/Frontend/assets/scripts/frame.js +++ b/Frontend/assets/scripts/frame.js @@ -31,9 +31,7 @@ function init() { changeActiveTools('XML'); var toolUrl = window.location.search.substring(1); - if (toolUrl == "") - loadLastPage(); - else if (tools.has(toolUrl)) + if (tools.has(toolUrl)) changeTool(toolUrl); else loadLastPage(); @@ -85,10 +83,12 @@ function changeActiveTools(activeCategoryButton) { * @returns {void} */ function changeTool(tool) { - const url = tools.get(tool); - localStorage.setItem("lastPage", tool); - document.getElementById("iframe").src = url; - document.location.search = tool; + if (tools.has(tool)) { + const url = tools.get(tool); + document.location.search = tool + "/"; + localStorage.setItem("lastPage", tool); + document.getElementById("iframe").src = url; + } } /**