oliverbooth/oliverbooth.dev
oliverbooth
/
oliverbooth.dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Compare commits

base: oliverbooth:3e20e41565ad0b62b5581b52ff6ed613225e58c5
Branches Tags
oliverbooth:main
oliverbooth:feature/cleanup
oliverbooth:feature/admin
oliverbooth:v1.1.0
...
compare: oliverbooth:e3702878cd6d286edf3145cf18d34724b9aea3f7
Branches Tags
oliverbooth:main
oliverbooth:feature/cleanup
oliverbooth:feature/admin
oliverbooth:v1.1.0

3 Commits
3e20e41565 ... e3702878cd

Author SHA1 Message Date
Oliver Booth e3702878cd
fix: register pre-existing bs tooltips 2023-08-10 23:31:34 +01:00
Oliver Booth 4cc9efce42
fix: escape <mark> first 2023-08-10 23:28:37 +01:00
Oliver Booth d1eeea3c85
refactor: ignore <mark> tag from highlighting 2023-08-10 23:28:23 +01:00
2 changed files with 14 additions and 4 deletions
Show Stats Expand all files Collapse all files

9
src/ts/UI.ts
View File

@ -67,12 +67,12 @@ class UI {
*/
public static updateUI(element?: Element) {
element = element || document.body;
UI.unescapeMarkTags(element);
UI.addLineNumbers(element);
UI.addHighlighting(element);
UI.addBootstrapTooltips(element);
UI.renderTeX(element);
UI.renderTimestamps(element);
UI.unescapeMarkTags(element);
}
/**
@ -81,6 +81,10 @@ class UI {
*/
public static addBootstrapTooltips(element?: Element) {
element = element || document.body;
const list = element.querySelectorAll('[data-bs-toggle="tooltip"]');
list.forEach((el: Element) => new bootstrap.Tooltip(el));
element.querySelectorAll("[title]").forEach((el) => {
el.setAttribute("data-bs-toggle", "tooltip");
el.setAttribute("data-bs-placement", "bottom");
@ -195,9 +199,6 @@ class UI {
let content = block.innerHTML;
// but ugly fucking hack. I hate this
content = content.replaceAll('<span class="token operator">&lt;</span>mark<span class="token operator">&gt;</span>', "<mark>");
content = content.replaceAll('<span class="token operator">&lt;</span><span class="token operator">/</span>mark<span class="token operator">&gt;</span>', "</mark>");
content = content.replaceAll("&lt;mark&gt;", "<mark>");
content = content.replaceAll("&lt;/mark&gt;", "</mark>");
block.innerHTML = content;

9
src/ts/app.ts
View File

@ -5,8 +5,17 @@ import Input from "./Input";
const pkg = require("../../package.json");
declare const Handlebars: any;
declare const Prism: any;
(() => {
Prism.languages.extend('markup', {});
Prism.languages.insertBefore('custom', 'tag', {
'mark': {
pattern: /<\/?mark(?:\s+\w+(?:=(?:"[^"]*"|'[^']*'|[^\s'">=]+))?\s*|\s*)\/?>/,
greedy: true
}
});
let isCtrl = false;
document.addEventListener('keyup', (e) => {
if (e.ctrlKey) isCtrl = false;