Commit distribution files

pull/115/head
Wes Cossick 9 years ago
parent 8d07c5e7f4
commit c55b5c6ecb

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -829,24 +829,24 @@ SimpleMDE.prototype.markdown = function(text) {
if(window.marked) { if(window.marked) {
// Initialize // Initialize
var markedOptions = {}; var markedOptions = {};
// Update options // Update options
if(this.options && this.options.renderingConfig && this.options.renderingConfig.singleLineBreaks !== false) { if(this.options && this.options.renderingConfig && this.options.renderingConfig.singleLineBreaks !== false) {
markedOptions.breaks = true; markedOptions.breaks = true;
} }
if(this.options && this.options.renderingConfig && this.options.renderingConfig.codeSyntaxHighlighting === true && window.hljs) { if(this.options && this.options.renderingConfig && this.options.renderingConfig.codeSyntaxHighlighting === true && window.hljs) {
markedOptions.highlight = function(code) { markedOptions.highlight = function(code) {
return hljs.highlightAuto(code).value; return hljs.highlightAuto(code).value;
} }
} }
// Set options // Set options
marked.setOptions(markedOptions); marked.setOptions(markedOptions);
// Return // Return
return marked(text); return marked(text);
} }

Loading…
Cancel
Save