From 9250000af69b5c0ddc73537ec40573df68283dcc Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Mon, 21 Oct 2019 19:44:52 +0200 Subject: move js sources to /src/ & remove old worker stuff --- .gitignore | 2 +- app/view/templates/layout.php | 5 --- assets/js/edit.js | 93 ------------------------------------------- src/edit.js | 92 ++++++++++++++++++++++++++++++++++++++++++ webpack.config.js | 2 +- 5 files changed, 94 insertions(+), 100 deletions(-) delete mode 100644 assets/js/edit.js create mode 100644 src/edit.js diff --git a/.gitignore b/.gitignore index 113303e..0eb7349 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .vscode/* -assets/js/*.bundle.js +*.bundle.js assets/render/* assets/global/* database/* diff --git a/app/view/templates/layout.php b/app/view/templates/layout.php index 3c38be4..91ae378 100644 --- a/app/view/templates/layout.php +++ b/app/view/templates/layout.php @@ -18,11 +18,6 @@ echo ''; } ?> - diff --git a/assets/js/edit.js b/assets/js/edit.js deleted file mode 100644 index 7df75de..0000000 --- a/assets/js/edit.js +++ /dev/null @@ -1,93 +0,0 @@ -import CodeMirror from "codemirror"; -import "codemirror/lib/codemirror.css"; -import "codemirror/mode/markdown/markdown.js"; - -let form; -let unsavedChanges = false; -const pageurl = basepath + pageid; - -let myCodeMirror = CodeMirror.fromTextArea(document.getElementById('main'), { - mode: 'markdown', - lineNumbers: true, -}); - -window.onload = () => { - form = document.getElementById('update'); - let inputs = form.elements; - for (let i = 0; i < inputs.length; i++) { - inputs[i].oninput = changeHandler; - } - - form.addEventListener("submit", function (event) { - event.preventDefault(); - submitHandler(this); - }); - window.onkeydown = keyboardHandler; - window.onbeforeunload = confirmExit; -}; - -/** - * Manage a keyboardEvent - * @param {KeyboardEvent} e - */ -function keyboardHandler(e) { - if (e.composed) { - if (e.ctrlKey) { - switch (e.key) { - // ctrl + s - case 's': - submitHandler(form); - break; - // ctrl + d - case 'd': - url = document.getElementById('update').getAttribute('href'); - window.open(url); - break; - default: - return true; - } - e.preventDefault(); - return false; - } - } -} - -/** - * Manage change event - * @param {InputEvent} e - */ -function changeHandler(e) { - if(e.target.classList.contains("toggle")||e.target.classList.contains("checkboxtab")) { - return; - } - unsavedChanges = true; -} - -/** - * Manage submit event - * @param {HTMLFormElement} form - */ -function submitHandler(form) { - var xhr = new XMLHttpRequest(); - var fd = new FormData(form); - - xhr.addEventListener("load", function(event) { - unsavedChanges = false; - alert("updated"); - }); - xhr.addEventListener("error", function(event) { - alert('Error while trying to update.'); - }); - xhr.open(form.method, form.action); - xhr.send(fd); -} - -/** - * Manage a beforeUnloadEvent - * @param {BeforeUnloadEvent} e - */ -function confirmExit(e) { - if (unsavedChanges) { - return 'You have unsaved changes, do you really want to leave this page?'; - } -} diff --git a/src/edit.js b/src/edit.js new file mode 100644 index 0000000..ac2fe58 --- /dev/null +++ b/src/edit.js @@ -0,0 +1,92 @@ +import CodeMirror from "codemirror"; +import "codemirror/lib/codemirror.css"; +import "codemirror/mode/markdown/markdown.js"; + +let form; +let unsavedChanges = false; + +let myCodeMirror = CodeMirror.fromTextArea(document.getElementById('main'), { + mode: 'markdown', + lineNumbers: true, +}); + +window.onload = () => { + form = document.getElementById('update'); + let inputs = form.elements; + for (let i = 0; i < inputs.length; i++) { + inputs[i].oninput = changeHandler; + } + + form.addEventListener("submit", function (event) { + event.preventDefault(); + submitHandler(this); + }); + window.onkeydown = keyboardHandler; + window.onbeforeunload = confirmExit; +}; + +/** + * Manage a keyboardEvent + * @param {KeyboardEvent} e + */ +function keyboardHandler(e) { + if (e.composed) { + if (e.ctrlKey) { + switch (e.key) { + // ctrl + s + case 's': + submitHandler(form); + break; + // ctrl + d + case 'd': + url = document.getElementById('update').getAttribute('href'); + window.open(url); + break; + default: + return true; + } + e.preventDefault(); + return false; + } + } +} + +/** + * Manage change event + * @param {InputEvent} e + */ +function changeHandler(e) { + if(e.target.classList.contains("toggle")||e.target.classList.contains("checkboxtab")) { + return; + } + unsavedChanges = true; +} + +/** + * Manage submit event + * @param {HTMLFormElement} form + */ +function submitHandler(form) { + var xhr = new XMLHttpRequest(); + var fd = new FormData(form); + + xhr.addEventListener("load", function(event) { + unsavedChanges = false; + alert("updated"); + }); + xhr.addEventListener("error", function(event) { + alert('Error while trying to update.'); + }); + xhr.open(form.method, form.action); + xhr.send(fd); +} + +/** + * Manage a beforeUnloadEvent + * @param {BeforeUnloadEvent} e + */ +function confirmExit(e) { + if (unsavedChanges) { + return 'You have unsaved changes, do you really want to leave this page?'; + } +} diff --git a/webpack.config.js b/webpack.config.js index 4e32da0..e18b201 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,7 +8,7 @@ module.exports = (env) => { // Constant entry: { - edit: './assets/js/edit.js', + edit: './src/edit.js', }, output: { filename: 'assets/js/[name].bundle.js', -- cgit v1.2.3