fix(showdown): fix for options merging into globalOptions

Passing an option to a specific converter affects other instances of the converter since options are merged into showdown's global options. This commit fixes that. Closes #153
showdownjs · May 26, 2015 · ddd6011 · ddd6011
1 parent a4e67a0
commit ddd6011
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git 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) {