From edfcc95cdfb5dbfa035e92abb283ea936f58a864 Mon Sep 17 00:00:00 2001 From: maru21 Date: Mon, 6 Nov 2023 20:13:18 +0100 Subject: [PATCH] sorting and cleanup --- js/2.0.2/{buildForm.js => buildHtmlForm.js} | 4 +-- js/2.0.2/createTemplate.js | 19 ++----------- js/2.0.2/evts.js | 24 +++++++++++++++- js/2.0.2/files.js | 21 +++----------- js/2.0.2/form.js | 31 ++++++--------------- js/2.0.2/parseTemplate.js | 4 +-- js/2.0.2/settings.js | 19 ++----------- 7 files changed, 43 insertions(+), 79 deletions(-) rename js/2.0.2/{buildForm.js => buildHtmlForm.js} (96%) diff --git a/js/2.0.2/buildForm.js b/js/2.0.2/buildHtmlForm.js similarity index 96% rename from js/2.0.2/buildForm.js rename to js/2.0.2/buildHtmlForm.js index c2413d3..5ed27a3 100644 --- a/js/2.0.2/buildForm.js +++ b/js/2.0.2/buildHtmlForm.js @@ -1,7 +1,7 @@ import { getFileName } from "./storage.js"; import pell from "./pell.js" -function transformTemplateObject(objects) { +function buildHtmlForm(objects) { let form = document.createElement("FORM"); form.setAttribute("method", "post"); form.setAttribute("action", "javascript:void(0)"); @@ -492,4 +492,4 @@ function userFileNameDiv(fileName) { return divContainer; } -export default transformTemplateObject; +export default buildHtmlForm; diff --git a/js/2.0.2/createTemplate.js b/js/2.0.2/createTemplate.js index 6f6f028..1c90d02 100644 --- a/js/2.0.2/createTemplate.js +++ b/js/2.0.2/createTemplate.js @@ -1,5 +1,5 @@ import {setNewTemplate, loadTemplate} from "./web.js"; -import { hideMenus, modalNotifier, resetNavBar } from "./evts.js"; +import { hideMenus, modalNotifier, resetNavBar, resetPage } from "./evts.js"; import { passwordHash, sanitize } from "./scripts.js"; function createTemplate(template = false) { @@ -35,22 +35,7 @@ function createTemplate(template = false) { hideMenus("force"); - let mainFormDiv = document.getElementById("mainForm"); - let outputDiv = document.getElementById("output"); - let submitContainerDiv = document.getElementById("submitContainer"); - let sidebarDiv = document.getElementById("sidebar"); - let fileInfoDiv = document.getElementById("outputInfo"); - - fileInfoDiv.innerHTML = ""; - fileInfoDiv.replaceWith(fileInfoDiv.cloneNode(true)); - mainFormDiv.innerHTML = ""; - mainFormDiv.replaceWith(mainFormDiv.cloneNode(true)); - outputDiv.innerHTML = ""; - outputDiv.replaceWith(outputDiv.cloneNode(true)); - submitContainerDiv.innerHTML = ""; - submitContainerDiv.replaceWith(submitContainerDiv.cloneNode(true)); - sidebarDiv.innerHTML = ""; - sidebarDiv.replaceWith(sidebarDiv.cloneNode(true)); + resetPage(); document.getElementById("mainForm").appendChild(createTemplateInput()); document.getElementById("sidebar").appendChild(loadTemplateSidebar(activeState.templates)); diff --git a/js/2.0.2/evts.js b/js/2.0.2/evts.js index d7de4af..1c12eec 100644 --- a/js/2.0.2/evts.js +++ b/js/2.0.2/evts.js @@ -296,6 +296,27 @@ function copyToClipBoard(html) { document.body.removeChild(container); } +function resetPage() { + let mainFormDiv = document.getElementById("mainForm"); + let outputDiv = document.getElementById("output"); + let submitContainerDiv = document.getElementById("submitContainer"); + let sidebarDiv = document.getElementById("sidebar"); + let fileInfoDiv = document.getElementById("outputInfo"); + + mainFormDiv.innerHTML = ""; + mainFormDiv.replaceWith(mainFormDiv.cloneNode(true)); + outputDiv.innerHTML = ""; + outputDiv.replaceWith(outputDiv.cloneNode(true)); + submitContainerDiv.innerHTML = ""; + submitContainerDiv.replaceWith(submitContainerDiv.cloneNode(true)); + sidebarDiv.innerHTML = ""; + sidebarDiv.replaceWith(sidebarDiv.cloneNode(true)); + + fileInfoDiv.innerHTML = ""; + fileInfoDiv.replaceWith(fileInfoDiv.cloneNode(true)); + fileInfoDiv.style.display = "none"; +} + export { hideMenus, showMenu, @@ -308,5 +329,6 @@ export { resetNavBar, printVersion, wrongPwAlert, - copyToClipBoard + copyToClipBoard, + resetPage }; diff --git a/js/2.0.2/files.js b/js/2.0.2/files.js index e9bb675..24d2abc 100644 --- a/js/2.0.2/files.js +++ b/js/2.0.2/files.js @@ -1,7 +1,7 @@ import { storeData, clearData, retrieveData, setTimeStamp } from "./storage.js"; import { loadTemplate } from "./web.js"; import parseForm from "./parseForm.js"; -import { copyToClipBoard, modalNotifier, resetNavBar } from "./evts.js"; +import { copyToClipBoard, modalNotifier, resetNavBar, resetPage } from "./evts.js"; import { passwordHash } from "./scripts.js"; function buildFile() { @@ -46,22 +46,7 @@ function buildFile() { document.getElementById("toggleTestBlocksMenu").style.display = "none"; //reset page and event listeners - let mainFormDiv = document.getElementById("mainForm"); - let outputDiv = document.getElementById("output"); - let submitContainerDiv = document.getElementById("submitContainer"); - let sidebarDiv = document.getElementById("sidebar"); - let fileInfoDiv = document.getElementById("outputInfo"); - - mainFormDiv.innerHTML = ""; - mainFormDiv.replaceWith(mainFormDiv.cloneNode(true)); - outputDiv.innerHTML = ""; - outputDiv.replaceWith(outputDiv.cloneNode(true)); - submitContainerDiv.innerHTML = ""; - submitContainerDiv.replaceWith(submitContainerDiv.cloneNode(true)); - sidebarDiv.innerHTML = ""; - sidebarDiv.replaceWith(sidebarDiv.cloneNode(true)); - fileInfoDiv.innerHTML = ""; - fileInfoDiv.replaceWith(fileInfoDiv.cloneNode(true)); + resetPage(); document.getElementById("mainForm").innerHTML = mainFormPlaceholder(); @@ -90,6 +75,8 @@ function loadFileDiv(fileName, template, pos) { function loadFileDivCallBack() { let tF = retrieveData("templateFiles"); + + document.getElementById("sidebar").appendChild(loadFileSidebar(tF)); let lT = activeState.loadedTemplate; diff --git a/js/2.0.2/form.js b/js/2.0.2/form.js index 6be250e..e39780c 100644 --- a/js/2.0.2/form.js +++ b/js/2.0.2/form.js @@ -1,8 +1,8 @@ import { retrieveData, storeData, createStorageObj } from "./storage.js"; -import parseInput from "./parseTemplate.js"; -import transformTemplateObject from "./buildForm.js"; -import { copyToClipBoard, handleOnBlur, modalNotifier } from "./evts.js"; +import parseTemplate from "./parseTemplate.js"; +import buildHtmlForm from "./buildHtmlForm.js"; +import { copyToClipBoard, handleOnBlur, modalNotifier, resetPage } from "./evts.js"; import parseForm, { parseTextMarkups } from "./parseForm.js"; import { setTemplatePreset } from "./web.js"; @@ -51,13 +51,13 @@ function buildForm(templateInput, loadOnly = false) { //parse text markups like !l !n in templateInput templateInput = parseTextMarkups(templateInput); - //set objects array for parseInput Function + //set objects array for parseTemplate Function var objects = []; //loop through words, parse it individually and add it to objects array for (let i = 0; i < wordArray.length; i++) { - parseInput(wordArray, objects, i); + parseTemplate(wordArray, objects, i); //console.log(wordArray[i]); } @@ -76,27 +76,12 @@ function buildForm(templateInput, loadOnly = false) { activeState.templateObjectsPurified = objectsPurified; //reset page and event listeners - let mainFormDiv = document.getElementById("mainForm"); - let outputDiv = document.getElementById("output"); - let submitContainerDiv = document.getElementById("submitContainer"); - let sidebarDiv = document.getElementById("sidebar"); - let fileInfoDiv = document.getElementById("outputInfo"); - - mainFormDiv.innerHTML = ""; - mainFormDiv.replaceWith(mainFormDiv.cloneNode(true)); - outputDiv.innerHTML = ""; - outputDiv.replaceWith(outputDiv.cloneNode(true)); - submitContainerDiv.innerHTML = ""; - submitContainerDiv.replaceWith(submitContainerDiv.cloneNode(true)); - sidebarDiv.innerHTML = ""; - fileInfoDiv.innerHTML = ""; - fileInfoDiv.replaceWith(fileInfoDiv.cloneNode(true)); - fileInfoDiv.style.display = "none"; + resetPage(); //finally build html code for Form and siddebar and add it to dom if needed - if (loadOnly) {return}; + if (loadOnly) return; - transformTemplateObject(objectsPurified); + buildHtmlForm(objectsPurified); //add events formEvts(); } diff --git a/js/2.0.2/parseTemplate.js b/js/2.0.2/parseTemplate.js index 9e88d67..3c0fcb0 100644 --- a/js/2.0.2/parseTemplate.js +++ b/js/2.0.2/parseTemplate.js @@ -1,4 +1,4 @@ -function parseInput(wordArray, objects, i) { +function parseTemplate(wordArray, objects, i) { let word = wordArray[i]; if (word.substring(0, 1) == "%") { @@ -385,4 +385,4 @@ function isCharNumber(c) { return c >= "0" && c <= "9"; } -export default parseInput; +export default parseTemplate; diff --git a/js/2.0.2/settings.js b/js/2.0.2/settings.js index d411ebb..b1b5b97 100644 --- a/js/2.0.2/settings.js +++ b/js/2.0.2/settings.js @@ -1,4 +1,4 @@ -import { hideMenus, modalNotifier, printVersion, resetNavBar } from "./evts.js"; +import { hideMenus, modalNotifier, printVersion, resetNavBar, resetPage } from "./evts.js"; import { passwordHash, sanitize } from "./scripts.js"; import { retrieveData, storeData, storeSettings } from "./storage.js"; @@ -28,22 +28,7 @@ const buildSettings = () => { hideMenus("force"); - let mainFormDiv = document.getElementById("mainForm"); - let outputDiv = document.getElementById("output"); - let submitContainerDiv = document.getElementById("submitContainer"); - let sidebarDiv = document.getElementById("sidebar"); - let fileInfoDiv = document.getElementById("outputInfo"); - - fileInfoDiv.innerHTML = ""; - fileInfoDiv.replaceWith(fileInfoDiv.cloneNode(true)); - mainFormDiv.innerHTML = ""; - mainFormDiv.replaceWith(mainFormDiv.cloneNode(true)); - outputDiv.innerHTML = ""; - outputDiv.replaceWith(outputDiv.cloneNode(true)); - submitContainerDiv.innerHTML = ""; - submitContainerDiv.replaceWith(submitContainerDiv.cloneNode(true)); - sidebarDiv.innerHTML = ""; - sidebarDiv.replaceWith(sidebarDiv.cloneNode(true)); + resetPage(); addSidebar();