improve renderer option handling

Don't waste time constructing a renderer then override it if one is
passed into the options object.
edit
Ujjwal Sharma 2021-05-13 19:58:45 +05:30
parent cf8e64bd85
commit 6884741b94
No known key found for this signature in database
GPG Key ID: 460B292812C67D9F
1 changed files with 24 additions and 20 deletions

View File

@ -424,34 +424,38 @@ const Plugin = () => {
deck = reveal;
let renderer = new marked.Renderer();
let { renderer, ...markedOptions } = deck.getConfig().markdown;
renderer.code = ( code, language ) => {
if (!renderer) {
let renderer = new marked.Renderer();
// Off by default
let lineNumbers = '';
renderer.code = ( code, language ) => {
// Users can opt in to show line numbers and highlight
// specific lines.
// ```javascript [] show line numbers
// ```javascript [1,4-8] highlights lines 1 and 4-8
if( CODE_LINE_NUMBER_REGEX.test( language ) ) {
lineNumbers = language.match( CODE_LINE_NUMBER_REGEX )[1].trim();
lineNumbers = `data-line-numbers="${lineNumbers}"`;
language = language.replace( CODE_LINE_NUMBER_REGEX, '' ).trim();
}
// Off by default
let lineNumbers = '';
// Escape before this gets injected into the DOM to
// avoid having the HTML parser alter our code before
// highlight.js is able to read it
code = escapeForHTML( code );
// Users can opt in to show line numbers and highlight
// specific lines.
// ```javascript [] show line numbers
// ```javascript [1,4-8] highlights lines 1 and 4-8
if( CODE_LINE_NUMBER_REGEX.test( language ) ) {
lineNumbers = language.match( CODE_LINE_NUMBER_REGEX )[1].trim();
lineNumbers = `data-line-numbers="${lineNumbers}"`;
language = language.replace( CODE_LINE_NUMBER_REGEX, '' ).trim();
}
return `<pre><code ${lineNumbers} class="${language}">${code}</code></pre>`;
};
// Escape before this gets injected into the DOM to
// avoid having the HTML parser alter our code before
// highlight.js is able to read it
code = escapeForHTML( code );
return `<pre><code ${lineNumbers} class="${language}">${code}</code></pre>`;
};
}
marked.setOptions( {
renderer,
...deck.getConfig().markdown
...markedOptions
} );
return processSlides( deck.getRevealElement() ).then( convertSlides );