mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2025-05-15 23:54:42 -04:00
Merge branch 'master' into webpack-frontend
This commit is contained in:
commit
6e651c8108
527 changed files with 2584 additions and 601 deletions
|
@ -12,6 +12,7 @@ var lastchangeui = {
|
|||
user: $(".ui-lastchangeuser"),
|
||||
nouser: $(".ui-no-lastchangeuser")
|
||||
}
|
||||
var ownerui = $(".ui-owner");
|
||||
|
||||
function updateLastChange() {
|
||||
if (!lastchangeui) return;
|
||||
|
@ -46,6 +47,23 @@ function updateLastChangeUser() {
|
|||
}
|
||||
}
|
||||
|
||||
var owner = null;
|
||||
var ownerprofile = null;
|
||||
function updateOwner() {
|
||||
if (ownerui) {
|
||||
if (owner && ownerprofile && owner !== lastchangeuser) {
|
||||
var icon = ownerui.children('i');
|
||||
icon.attr('title', ownerprofile.name).tooltip('fixTitle');
|
||||
var styleString = 'background-image:url(' + ownerprofile.photo + ')';
|
||||
if (ownerprofile.photo && icon.attr('style') !== styleString)
|
||||
icon.attr('style', styleString);
|
||||
ownerui.show();
|
||||
} else {
|
||||
ownerui.hide();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//get title
|
||||
function getTitle(view) {
|
||||
var title = "";
|
||||
|
@ -426,6 +444,33 @@ function finishView(view) {
|
|||
height: '400px'
|
||||
});
|
||||
});
|
||||
//syntax highlighting
|
||||
view.find("pre.raw").removeClass("raw")
|
||||
.each(function (key, value) {
|
||||
var langDiv = $(value).find('code.hljs');
|
||||
if (langDiv.length > 0) {
|
||||
var reallang = langDiv[0].className.replace('hljs', '').trim();
|
||||
var codeDiv = $(value).find('.code');
|
||||
var code = "";
|
||||
if (codeDiv.length > 0) code = codeDiv.html();
|
||||
else code = langDiv.html();
|
||||
code = md.utils.unescapeAll(code);
|
||||
if (reallang == "tiddlywiki" || reallang == "mediawiki") {
|
||||
var result = {
|
||||
value: Prism.highlight(code, Prism.languages.wiki)
|
||||
};
|
||||
} else {
|
||||
var languages = hljs.listLanguages();
|
||||
if (languages.indexOf(reallang) == -1) {
|
||||
var result = hljs.highlightAuto(code);
|
||||
} else {
|
||||
var result = hljs.highlight(reallang, code);
|
||||
}
|
||||
}
|
||||
if (codeDiv.length > 0) codeDiv.html(result.value);
|
||||
else langDiv.html(result.value);
|
||||
}
|
||||
});
|
||||
//render title
|
||||
document.title = renderTitle(view);
|
||||
}
|
||||
|
@ -766,19 +811,9 @@ function highlightRender(code, lang) {
|
|||
} else if (lang == 'mermaid') {
|
||||
return '<div class="mermaid raw">' + code + '</div>';
|
||||
}
|
||||
var reallang = lang.replace(/\=$|\=\d+$|\=\+$/, '');
|
||||
if (reallang == "tiddlywiki" || reallang == "mediawiki") {
|
||||
var result = {
|
||||
value: Prism.highlight(code, Prism.languages.wiki)
|
||||
};
|
||||
} else {
|
||||
var languages = hljs.listLanguages();
|
||||
if (languages.indexOf(reallang) == -1) {
|
||||
var result = hljs.highlightAuto(code);
|
||||
} else {
|
||||
var result = hljs.highlight(reallang, code);
|
||||
}
|
||||
}
|
||||
var result = {
|
||||
value: code
|
||||
};
|
||||
var showlinenumbers = /\=$|\=\d+$|\=\+$/.test(lang);
|
||||
if (showlinenumbers) {
|
||||
var startnumber = 1;
|
||||
|
@ -878,7 +913,7 @@ md.renderer.rules.fence = function (tokens, idx, options, env, self) {
|
|||
return highlighted + '\n';
|
||||
}
|
||||
|
||||
return '<pre><code' + self.renderAttrs(token) + '>'
|
||||
return '<pre class="raw"><code' + self.renderAttrs(token) + '>'
|
||||
+ highlighted
|
||||
+ '</code></pre>\n';
|
||||
};
|
||||
|
@ -1050,5 +1085,6 @@ module.exports = {
|
|||
renderFilename: renderFilename,
|
||||
generateToc: generateToc,
|
||||
smoothHashScroll: smoothHashScroll,
|
||||
scrollToHash: scrollToHash
|
||||
scrollToHash: scrollToHash,
|
||||
owner: owner
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue