From 093445972d7a65eca79b4288acbc64723dc54567 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 25 May 2023 10:47:54 +0200 Subject: [PATCH 1/3] First, quick fix --- Frontend/assets/css/tools/mock/r11tool.css | 1 + 1 file changed, 1 insertion(+) 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; } -- 2.51.0 From 1da42aaeeacace08cb44c04132b9d20fc138cdc7 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 25 May 2023 11:17:42 +0200 Subject: [PATCH 2/3] Fixed reload loop bug --- Frontend/assets/scripts/frame.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Frontend/assets/scripts/frame.js b/Frontend/assets/scripts/frame.js index 3e2e867..ebdec23 100644 --- a/Frontend/assets/scripts/frame.js +++ b/Frontend/assets/scripts/frame.js @@ -85,10 +85,13 @@ 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; + console.log("changeTool"); + if (tools.has(tool)) { + const url = tools.get(tool); + document.location.search = tool; + localStorage.setItem("lastPage", tool); + document.getElementById("iframe").src = url; + } } /** -- 2.51.0 From 50012a8a048db136afe0c8c1640ba9d2c47c75e5 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 25 May 2023 11:30:04 +0200 Subject: [PATCH 3/3] Fixed that bug for real this time --- Frontend/assets/scripts/frame.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Frontend/assets/scripts/frame.js b/Frontend/assets/scripts/frame.js index ebdec23..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,9 @@ function changeActiveTools(activeCategoryButton) { * @returns {void} */ function changeTool(tool) { - console.log("changeTool"); if (tools.has(tool)) { const url = tools.get(tool); - document.location.search = tool; + document.location.search = tool + "/"; localStorage.setItem("lastPage", tool); document.getElementById("iframe").src = url; } -- 2.51.0