diff --git a/dist/showdown.js b/dist/showdown.js index 9bbaafa..773d248 100644 Binary files a/dist/showdown.js and b/dist/showdown.js differ diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 049006b..ef9ea76 100644 Binary files a/dist/showdown.js.map and b/dist/showdown.js.map differ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 6f95eef..76c620d 100644 Binary files a/dist/showdown.min.js and b/dist/showdown.min.js differ diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 5efb50b..e376033 100644 Binary files a/dist/showdown.min.js.map and b/dist/showdown.min.js.map differ diff --git a/src/showdown.js b/src/showdown.js index 56a9f48..e427fd3 100644 --- a/src/showdown.js +++ b/src/showdown.js @@ -131,7 +131,7 @@ showdown.Converter = function (converterOptions) { converterOptions = converterOptions || {}; - var options = globalOptions, + var options = {}, langExtensions = [], outputModifiers = [], parserOrder = [ @@ -142,6 +142,12 @@ showdown.Converter = function (converterOptions) { 'unescapeSpecialChars' ]; + for (var gOpt in globalOptions) { + if (globalOptions.hasOwnProperty(gOpt)) { + options[gOpt] = globalOptions[gOpt]; + } + } + // Merge options if (typeof converterOptions === 'object') { for (var opt in converterOptions) {