Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add languages by filename #55

Merged
merged 5 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/password.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<!-- SCRIPTS -->
<script src="/static/scripts/initialTheme.js?v=1"></script>
<script src="/static/scripts/utils.js"></script>
<script src="/static/scripts/themes.js?v=1" defer></script>
<script src="/static/scripts/hidecopy.js?v=1" defer></script>
<script src="/static/scripts/highlightsHTMX.js?v=5"></script>
Expand Down
1 change: 1 addition & 0 deletions web/paste.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<!-- SCRIPTS -->
<script src="/static/scripts/initialTheme.js?v=1"></script>
<script src="/static/scripts/utils.js"></script>
<script src="/static/scripts/themes.js?v=1" defer></script>
<script src="/static/scripts/hidecopy.js?v=1" defer></script>
<script src="/static/scripts/highlights.js?v=5" defer></script>
Expand Down
15 changes: 13 additions & 2 deletions web/static/scripts/highlights.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@ let DlCount = 0;

for (let area of HIGHLIGHT_AREAS) {
let code = area.querySelector("pre > code");
let name = area.querySelector(".pasteHeader > div > .filenameArea");

pasteStores.push(code.textContent);

// Highlight Code Block and get Language Details...
let details = hljs.highlightAuto(code.textContent);
let highlightedLang = details.language ? details.language : "plaintext";
let nameLang = getLangByName(name.textContent);
let highlightedLang;
let details;

if (!nameLang) {
details = hljs.highlightAuto(code.textContent);
highlightedLang = details.language ? details.language : "plaintext";
EvieePy marked this conversation as resolved.
Show resolved Hide resolved
} else {
details = hljs.highlight(code.textContent, { "language": nameLang })
highlightedLang = nameLang.toLowerCase();
}

code.innerHTML = details.value;

Expand Down
14 changes: 12 additions & 2 deletions web/static/scripts/highlightsHTMX.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,21 @@ document.addEventListener("htmx:afterRequest", function (evt) {

for (let area of HIGHLIGHT_AREAS) {
let code = area.querySelector("pre > code");
let name = area.querySelector(".pasteHeader > div > .filenameArea");
pasteStores.push(code.textContent);

// Highlight Code Block and get Language Details...
let details = hljs.highlightAuto(code.textContent);
let highlightedLang = details.language ? details.language : "plaintext";
let nameLang = getLangByName(name.textContent);
let highlightedLang;
let details;

if (!nameLang) {
details = hljs.highlightAuto(code.textContent);
highlightedLang = details.language ? details.language : "plaintext";
EvieePy marked this conversation as resolved.
Show resolved Hide resolved
} else {
details = hljs.highlight(code.textContent, { "language": nameLang })
highlightedLang = nameLang.toLowerCase();
}

code.innerHTML = details.value;

Expand Down
14 changes: 14 additions & 0 deletions web/static/scripts/utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
function getLangByName(name) {
splat = name.split(".");
if (splat.length <= 1) {
return null
}

ext = splat[splat.length - 1];
lang = hljs.getLanguage(ext);

if (!lang) {
return null
}
return lang.name;
}
Loading