Merge pull request #115 from NextStepWebs/development

Add dist files
This commit is contained in:
Wes Cossick 2015-09-25 17:11:16 -05:00
commit ec8bba319d
3 changed files with 15 additions and 15 deletions

File diff suppressed because one or more lines are too long

14
dist/simplemde.min.js vendored

File diff suppressed because one or more lines are too long

View file

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