szTom/wschat-ng
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

[feature] hight light js

Browse Source
This commit is contained in:
zhangtianli2006 2021-03-26 18:59:59 +08:00
parent ba89b0c216
commit f6fba2dd73
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -33,6 +33,8 @@
<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
<script src="./script.js"></script> <script src="./script.js"></script>
<script src="https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/remarkable.js"></script> <script src="https://cdn.jsdelivr.net/npm/remarkable@2.0.1/dist/remarkable.js"></script>
<link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.7.1/build/styles/tomorrow.min.css">
<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.7.1/build/highlight.min.js"></script>
</body> </body>
</html> </html>

19
public/script.js
View File

@ -39,7 +39,7 @@ function write_message(data) {
if (!data.plain) { if (!data.plain) {
rendered_message = md.render(message); rendered_message = md.render(message);
} else { } else {
rendered_message = `<pre>${message}</pre>`; rendered_message = `${message}`;
} }
rendered_message = DOMPurify.sanitize(rendered_message); rendered_message = DOMPurify.sanitize(rendered_message);
@ -67,7 +67,22 @@ async function init() {
clear_message(); clear_message();
await login_name(); await login_name();
md = new remarkable.Remarkable(); md = new remarkable.Remarkable({
highlight: function (str, lang) {
if (lang && hljs.getLanguage(lang)) {
try {
return hljs.highlight(lang, str).value;
} catch (err) { }
}
try {
return hljs.highlightAuto(str).value;
} catch (err) { }
return '';
}
});
md.inline.ruler.enable(['mark', 'sup', 'sub']); md.inline.ruler.enable(['mark', 'sup', 'sub']);
const ws = new io(server); const ws = new io(server);

4
public/style.css
View File

@ -60,7 +60,7 @@ pre {
font-size: 17px; font-size: 17px;
padding: 30px; padding: 30px;
width: 100vw; width: 100vw;
height: 30vh; height: calc(30vh - 100px);
box-shadow: 0 1px 3px rgba(50, 50, 93, .15), 0 1px 0 rgba(0, 0, 0, .02); box-shadow: 0 1px 3px rgba(50, 50, 93, .15), 0 1px 0 rgba(0, 0, 0, .02);
} }
@ -169,4 +169,4 @@ pre {
#confirm-prompt { #confirm-prompt {
float: right; float: right;
margin-top: 15px; margin-top: 15px;
} }