matthias
/
WhisperMaPhone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Image support 

- Allow data: URIs in Remarkable
- Load Remarkable after the main JS has run
- CSS for images
This commit is contained in:
MatthiasSaihttam 2020-11-13 12:11:40 -05:00
parent 8664b7156f
commit 3ddc8d8cea
2 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/static/main/main.css
View File

@ -160,6 +160,11 @@ a {
padding: 3px;
}
.text img {
max-width: 100%;
max-height: 500px;
}
.extended-text {
margin-top: 1em;
display: inline-block; /*Needs to be inline-block, so that margin on it works*/

62
main/templates/whispermaphone/index.html
View File

@ -40,28 +40,9 @@
<!-- <a href="/post" style="color: var(&#45;&#45;text-color); margin-left: 100px; text-decoration: none">POST</a>-->
<!-- {% endif %}</footer>-->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/styles/tomorrow-night.min.css">
<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/highlight.min.js"></script>
<!--Remarkable UMD bundle, includes linkify and Remarkable in the global remarkable-->
<script src="https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/remarkable.min.js"></script>
<script>
// Remarkable ES6 module
// import { Remarkable } from "https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/esm/index.browser.min.js";
// import { linkify } from "https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/esm/linkify.js";
const md = new remarkable.Remarkable({
html: true, breaks: true, typographer: true,
highlight: function (str, lang) {
if (lang && hljs.getLanguage(lang)) {
return hljs.highlight(lang, str).value;
}
return hljs.highlightAuto(str).value;
}
}).use(remarkable.linkify);
const els = document.querySelectorAll(".thought");
for (let el of els) {
const extended = el.querySelector(".extended-text");
const mainText = el.querySelector(".main-text");
@ -83,10 +64,6 @@
main.appendChild(showMoreButton);
}
//Markdown + highlight
extended.innerHTML = md.render(extended.innerHTML);
mainText.innerHTML = md.render(mainText.innerHTML);
const timestampEl = el.querySelector(".timestamp");
const time = new Date(timestampEl.textContent);
const ampm = time.getHours() >= 12 ? "pm" : "am";
@ -101,5 +78,42 @@
timestampEl.textContent = `${time.getFullYear()}-${time.getMonth()+1}-${time.getDate()}, ${hours}:${minutes}${ampm}`
}
</script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/styles/tomorrow-night.min.css">
<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/highlight.min.js"></script>
<!--Remarkable UMD bundle, includes linkify and Remarkable in the global remarkable-->
<script src="https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/remarkable.min.js"></script>
<script>
// Remarkable ES6 module
// import { Remarkable } from "https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/esm/index.browser.min.js";
// import { linkify } from "https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/esm/linkify.js";
const md = new remarkable.Remarkable({
html: true, breaks: true, typographer: true,
highlight: function (str, lang) {
if (lang && hljs.getLanguage(lang)) {
return hljs.highlight(lang, str).value;
}
return hljs.highlightAuto(str).value;
}
}).use(remarkable.linkify);
// Allow data: URIs for images, from https://github.com/jonschlinkert/remarkable/issues/329
const originalLinkValidator = md.inline.validateLink;
const dataLinkRegex = /^\s*data:([a-z]+\/[a-z]+(;[a-z-]+=[a-z-]+)?)?(;base64)?,[a-z0-9!$&'',()*+,;=\-._~:@/?%\s]*\s*$/i;
md.inline.validateLink = (url) => originalLinkValidator(url) || url.match(dataLinkRegex);
for (let el of els) {
const extended = el.querySelector(".extended-text");
const mainText = el.querySelector(".main-text");
//Markdown + highlight
extended.innerHTML = md.render(extended.innerHTML);
mainText.innerHTML = md.render(mainText.innerHTML);
}
</script>
</body>
</html>