Bladeren bron

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
Estevão Soares dos Santos 10 jaren geleden
bovenliggende
commit
ddd6011df2
5 gewijzigde bestanden met toevoegingen van 16 en 4 verwijderingen
  1. 8 2
      dist/showdown.js
  2. 0 0
      dist/showdown.js.map
  3. 1 1
      dist/showdown.min.js
  4. 0 0
      dist/showdown.min.js.map
  5. 7 1
      src/showdown.js

+ 8 - 2
dist/showdown.js

@@ -1,4 +1,4 @@
-;/*! showdown 15-05-2015 */
+;/*! showdown 26-05-2015 */
 (function(){
 /**
  * Created by Tivie on 06-01-2015.
@@ -133,7 +133,7 @@ showdown.Converter = function (converterOptions) {
 
   converterOptions = converterOptions || {};
 
-  var options = globalOptions,
+  var options = {},
       langExtensions = [],
       outputModifiers = [],
       parserOrder = [
@@ -144,6 +144,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) {

File diff suppressed because it is too large
+ 0 - 0
dist/showdown.js.map


File diff suppressed because it is too large
+ 1 - 1
dist/showdown.min.js


File diff suppressed because it is too large
+ 0 - 0
dist/showdown.min.js.map


+ 7 - 1
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) {

Some files were not shown because too many files changed in this diff