github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-25 03:06:31 -05:00
Code Issues Projects Releases Packages Wiki Activity

Support specify or continue line number in code blocks

Browse source
This commit is contained in:
Wu Cheng-Han 2015-10-22 17:15:44 +08:00
parent 2cfcae6db2
commit f23369ea9f
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
public/js/extra.js
View file

@ -210,6 +210,16 @@ function postProcess(code) {
}); });
//link should open in new window or tab //link should open in new window or tab
result.find('a:not([target])').attr('target', '_blank'); result.find('a:not([target])').attr('target', '_blank');
//update continue line numbers
var linenumberdivs = result.find('.gutter.linenumber').toArray();
for (var i = 0; i < linenumberdivs.length; i++) {
if ($(linenumberdivs[i]).hasClass('continue')) {
var startnumber = linenumberdivs[i - 1] ? parseInt($(linenumberdivs[i - 1]).find('> span').last().attr('data-linenumber')) : 0;
$(linenumberdivs[i]).find('> span').each(function(key, value) {
$(value).attr('data-linenumber', startnumber + key + 1);
});
}
}
return result; return result;
} }
@ -464,14 +474,14 @@ function highlightRender(code, lang) {
} else if (lang == 'flow') { } else if (lang == 'flow') {
return '<div class="flow-chart raw">' + code + '</div>'; return '<div class="flow-chart raw">' + code + '</div>';
} }
var reallang = lang.replace('=', ''); var reallang = lang.replace(/\=$|\=\d+$|\=\+$/, '');
var languages = hljs.listLanguages(); var languages = hljs.listLanguages();
if (languages.indexOf(reallang) == -1) { if (languages.indexOf(reallang) == -1) {
var result = hljs.highlightAuto(code); var result = hljs.highlightAuto(code);
} else { } else {
var result = hljs.highlight(reallang, code); var result = hljs.highlight(reallang, code);
} }
var showlinenumbers = /\=$|(\d+)$/.test(lang); var showlinenumbers = /\=$|\=\d+$|\=\+$/.test(lang);
if (showlinenumbers) { if (showlinenumbers) {
var startnumber = 1; var startnumber = 1;
var matches = lang.match(/\=(\d+)$/); var matches = lang.match(/\=(\d+)$/);
@ -482,7 +492,8 @@ function highlightRender(code, lang) {
for (var i = 0; i < lines.length - 1; i++) { for (var i = 0; i < lines.length - 1; i++) {
linenumbers[i] = "<span data-linenumber='" + (startnumber + i) + "'></span>"; linenumbers[i] = "<span data-linenumber='" + (startnumber + i) + "'></span>";
} }
var linegutter = "<div class='gutter linenumber'>" + linenumbers.join('\n') + "</div>"; var continuelinenumber = /\=\+$/.test(lang);
var linegutter = "<div class='gutter linenumber" + (continuelinenumber ? " continue" : "") + "'>" + linenumbers.join('\n') + "</div>";
result.value = "<div class='wrapper'>" + linegutter + "<div class='code'>" + result.value + "</div></div>"; result.value = "<div class='wrapper'>" + linegutter + "<div class='code'>" + result.value + "</div></div>";
} }
return result.value; return result.value;
@ -541,7 +552,7 @@ md.renderer.rules.fence = function (tokens, idx, options, env, self) {
} }
langName = Remarkable.utils.escapeHtml(Remarkable.utils.replaceEntities(Remarkable.utils.unescapeMd(fenceName))); langName = Remarkable.utils.escapeHtml(Remarkable.utils.replaceEntities(Remarkable.utils.unescapeMd(fenceName)));
langClass = ' class="' + langPrefix + langName.replace('=', '') + ' hljs"'; langClass = ' class="' + langPrefix + langName.replace(/\=$|\=\d+$|\=\+$/, '') + ' hljs"';
} }
if (options.highlight) { if (options.highlight) {

2
public/js/syncscroll.js
View file

@ -102,7 +102,7 @@ md.renderer.rules.fence = function (tokens, idx, options, env, self) {
} }
langName = Remarkable.utils.escapeHtml(Remarkable.utils.replaceEntities(Remarkable.utils.unescapeMd(fenceName))); langName = Remarkable.utils.escapeHtml(Remarkable.utils.replaceEntities(Remarkable.utils.unescapeMd(fenceName)));
langClass = ' class="' + langPrefix + langName.replace('=', '') + ' hljs"'; langClass = ' class="' + langPrefix + langName.replace(/\=$|\=\d+$|\=\+$/, '') + ' hljs"';
} }
if (options.highlight) { if (options.highlight) {