gsadmin/gitbook
1
0
Fork 0
mirror of https://github.com/GitbookIO/gitbook.git synced 2026-09-24 11:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

In parse/page remove global marked settings

Browse Source 
Highlighter settings were global, moved them to the render function
(where they should have been)
This commit is contained in:
Aaron O'Mullan
2014-04-16 13:07:35 -07:00
parent a0ae34a3b7
commit 9e4b393b7a
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/parse/page.js
+10 -12
View File
@@ -8,17 +8,6 @@ var renderer = require('./renderer');
var lnormalize = require('../utils/lang').normalize;
// Synchronous highlighting with highlight.js
marked.setOptions({
highlight: function (code, lang) {
try {
return hljs.highlight(lang, code).value;
} catch(e) {
return hljs.highlightAuto(code).value;
}
}
});
// Render a section using our custom renderer
function render(section, _options) {
@@ -30,7 +19,16 @@ function render(section, _options) {
// Build options using defaults and our custom renderer
var options = _.extend({}, marked.defaults, {
renderer: renderer(null, _options)
renderer: renderer(null, _options),
// Synchronous highlighting with highlight.js
highlight: function (code, lang) {
try {
return hljs.highlight(lang, code).value;
} catch(e) {
return hljs.highlightAuto(code).value;
}
}
});
return marked.parser(section, options);