From 42a400ac19f64cbac26502317a846dd864991217 Mon Sep 17 00:00:00 2001 From: Lukas Schulte Pelkum Date: Fri, 4 Jun 2021 12:36:03 +0200 Subject: [PATCH] Revert line highlighting --- web/assets/css/style.css | 12 --------- web/assets/css/style.css.map | 2 +- web/assets/css/style.scss | 10 -------- web/assets/js/autoload.js | 44 ++++----------------------------- web/assets/js/buttons.js | 22 ++++++++--------- web/assets/js/notifications.js | 4 +-- web/index.html | 45 +++++++++++++++++++++++----------- 7 files changed, 49 insertions(+), 90 deletions(-) diff --git a/web/assets/css/style.css b/web/assets/css/style.css index 8a2fd15..3c13a91 100644 --- a/web/assets/css/style.css +++ b/web/assets/css/style.css @@ -146,12 +146,6 @@ html, body { text-align: center; } -.container #linenos span:hover, .container #linenos span.highlight { - background-color: #92b300; - color: #ffffff; - cursor: pointer; -} - .container #content { padding: 20px; width: calc(100vw - 50px); @@ -162,12 +156,6 @@ html, body { white-space: pre-wrap; } -.container #content #code .highlight { - background-color: #92b30071; - display: inline-block; - min-width: 100%; -} - .container #content #input { height: 100%; width: 100%; diff --git a/web/assets/css/style.css.map b/web/assets/css/style.css.map index acfb694..4c6aef0 100644 --- a/web/assets/css/style.css.map +++ b/web/assets/css/style.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "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", "sources": [ "style.scss" ], diff --git a/web/assets/css/style.scss b/web/assets/css/style.scss index 93d728f..546c847 100644 --- a/web/assets/css/style.scss +++ b/web/assets/css/style.scss @@ -110,11 +110,6 @@ html, body { display: block; width: 100%; text-align: center; - &:hover, &.highlight { - background-color: #92b300; - color: #ffffff; - cursor: pointer; - } } } & #content { @@ -123,11 +118,6 @@ html, body { & #code { word-break: break-all; white-space: pre-wrap; - & .highlight { - background-color: #92b30071; - display: inline-block; - min-width: 100%; - } } & #input { height: 100%; diff --git a/web/assets/js/autoload.js b/web/assets/js/autoload.js index 770d57f..43829b5 100644 --- a/web/assets/js/autoload.js +++ b/web/assets/js/autoload.js @@ -29,7 +29,7 @@ async function loadPaste() { const split = location.pathname.replace("/", "").split("."); const pasteID = split[0]; const language = split[1]; - + // Retrieve the paste from the API and redirect the user to the main page if it could not be found const response = await api.getPaste(pasteID); if (!response.ok) { @@ -37,63 +37,29 @@ async function loadPaste() { return; } const data = await response.json(); - + // Adjust the button states document.getElementById("btn_save").setAttribute("disabled", true); document.getElementById("btn_delete").removeAttribute("disabled"); document.getElementById("btn_copy").removeAttribute("disabled"); - + // Set the paste content to the DOM const code = document.getElementById("code"); code.innerHTML = language ? hljs.highlight(language, data.content).value : hljs.highlightAuto(data.content).value; - + // Display the line numbers const lineNOs = document.getElementById("linenos"); lineNOs.innerHTML = data.content.split(/\n/).map((_, index) => `${index + 1}`).join(''); - const sharedLine = parseInt(window.location.hash.toLowerCase().replace("#l", ""), 10); - if (sharedLine) { - lineNOs.innerHTML = data.content.split(/\n/).map((_, index) => { - return index + 1 === sharedLine - ? `${index + 1}` - : `${index + 1}`; - }).join(''); - - let html = code.innerHTML.split(/\n/); - html[sharedLine-1] = `${html[sharedLine-1]}`; - code.innerHTML = html.join("\n"); - } - - // TODO: Update this shitty construct - lineNOs.childNodes.forEach(node => { - node.addEventListener("click", function(_) { - const address = location.protocol + "//" + location.host + location.pathname + "#L" + node.innerText; - location.replace(address); - location.reload(); - }); - node.addEventListener("mouseover", function(_) { - let html = code.innerHTML.split(/\n/); - const index = parseInt(node.innerText, 10) - 1; - html[index] = `${html[index]}`; - code.innerHTML = html.join("\n"); - }); - node.addEventListener("mouseout", function(_) { - let html = code.innerHTML.split(/\n/); - const index = parseInt(node.innerText, 10) - 1; - html[index] = html[index].substring(24, html[index].length - 7); - code.innerHTML = html.join("\n"); - }); - }); - // Set the PASTE_ID variable PASTE_ID = pasteID; } else { const input = document.getElementById("input"); input.classList.remove("hidden"); input.focus(); - window.addEventListener("keydown", function(event) { + window.addEventListener("keydown", function (event) { if (event.keyCode != 9) return; event.preventDefault(); input.value += " "; diff --git a/web/assets/js/buttons.js b/web/assets/js/buttons.js index 682da61..b246c81 100644 --- a/web/assets/js/buttons.js +++ b/web/assets/js/buttons.js @@ -6,10 +6,10 @@ import * as notifications from "./notifications.js"; // setupKeybinds initializes the keybinds for the buttons export function setupKeybinds() { - window.addEventListener("keydown", function(event) { + window.addEventListener("keydown", function (event) { // Return if the CTRL key was not pressed if (!event.ctrlKey) return; - + // Define the DOM element of the pressed button let element = null; switch (event.keyCode) { @@ -30,7 +30,7 @@ export function setupKeybinds() { break; } } - + // Call the onClick function of the button if (element) { if (element.hasAttribute("disabled")) return; @@ -43,13 +43,13 @@ export function setupKeybinds() { // setupButtons configures the click listeners of the buttons export function setupButtons() { // Define the behavior of the 'new' button - document.getElementById("btn_new").addEventListener("click", function() { + document.getElementById("btn_new").addEventListener("click", function () { location.replace(location.protocol + "//" + location.host); }); // Define the behavior of the 'save' button - document.getElementById("btn_save").addEventListener("click", function() { - spinner.surround(async function() { + document.getElementById("btn_save").addEventListener("click", function () { + spinner.surround(async function () { // Return if the text area is empty const input = document.getElementById("input"); if (!input.value) return; @@ -75,8 +75,8 @@ export function setupButtons() { }); // Define the behavior of the 'delete' button - document.getElementById("btn_delete").addEventListener("click", function() { - spinner.surround(async function() { + document.getElementById("btn_delete").addEventListener("click", function () { + spinner.surround(async function () { // Ask the user for the deletion token const deletionToken = prompt("Deletion Token:"); if (!deletionToken) return; @@ -95,11 +95,11 @@ export function setupButtons() { }); // Define the behavior of the 'copy' button - document.getElementById("btn_copy").addEventListener("click", function() { - spinner.surround(async function() { + document.getElementById("btn_copy").addEventListener("click", function () { + spinner.surround(async function () { // Ask for the clipboard permissions askClipboardPermissions(); - + // Copy the code await navigator.clipboard.writeText(document.getElementById("code").innerText); notifications.success("Copied the code!"); diff --git a/web/assets/js/notifications.js b/web/assets/js/notifications.js index 888741c..cdbd2df 100644 --- a/web/assets/js/notifications.js +++ b/web/assets/js/notifications.js @@ -18,7 +18,5 @@ function create(type, message, duration) { node.innerHTML = message; element.appendChild(node); - setTimeout(function() { - element.removeChild(node); - }, duration); + setTimeout(() => element.removeChild(node), duration); } \ No newline at end of file diff --git a/web/index.html b/web/index.html index a9fc50b..dcda9c3 100644 --- a/web/index.html +++ b/web/index.html @@ -1,5 +1,6 @@ + @@ -7,29 +8,36 @@ +