From ddd6011df2b7cf5914c967946a7c4e7f381ffc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Tue, 26 May 2015 19:46:07 +0100 Subject: [PATCH] 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 --- dist/showdown.js | Bin 46629 -> 46754 bytes dist/showdown.js.map | Bin 151837 -> 152248 bytes dist/showdown.min.js | Bin 14305 -> 14354 bytes dist/showdown.min.js.map | Bin 15425 -> 15494 bytes src/showdown.js | 8 +++++++- 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dist/showdown.js b/dist/showdown.js index 9bbaafac1cb46bcbb5c03b843cbe27073eddb428..773d2484b700d0b31da1b8a59f7bcc022f4d6460 100644 GIT binary patch delta 174 zcmZ4bhH24TCIM@GEk%XmjQsMH{PH{nBeRVH?Oc=piAqe~#dV=REx$-Xqb#vVA>F^A zL?JUzAw4HQDKQ7g$;{6y)>NqGQUHR?GzAS53B8QOV*m2IfTH|@)S{9~4Ule4m}&)u ee2DgFkZ`PmEvlgqQERZlthGR@c5@r|{8a!MN<1n6 delta 56 zcmZ4VmTBo5CIM@GEk%XmjQsMH{PH{nL(`1{?OgonIr&M6IsOGDnfZCeI$V<%2#HKy M&vjulJJ0M@06ldSeE|GG$zo6&{F8ZVC{Yexa0+dvdxl z|K$6ctdsxva!z&@RcExEY$u>K`K>h9^y8Y0LX5_fFII?5Pl#t!o%|qIWby??&dCi6 zSthqCiBDh9$jCLlPl}OebHD6$d1mtKsx4k|At5OYTY;R&=Y)^1>X>V?GmvEi|8JB~R0q(a8 HlL4*201YUy diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 6f95eefa9f8a2f79ba230ad04d887886fd495f4a..76c620d1197cd545ddf324462afc4994ece5576d 100644 GIT binary patch delta 160 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 XRSw&&Ib^56WnI{!E#WpME`0spgFSi* delta 5069 zcmcIoO>A3P6_%r6T1uO=O`9fZnxtu(N#obrj_o*Z(;4o&etv#^aU92S99N@ZGHIJQ zaU91uXZD|*C^h+(_lHh>(9{%l z)bCDTI%5lwkD7)haFJ9_$HZz2cG0Oi(t`)NHWQ%7qyau zTNSgce&5{L2EnwDO9?GlW5L3vYHpbus2nsMkwz8~*`zN+%0n$&zEOAQQ zn)dFrm=Y?oNu)`}&3RhNu_@;bmS<6W4%>y0SwHB+R)WlU zPN?~F*L`92)pOYn1OX7#q)`-7a4iIBvg+#Z=e~F;k}yiZ%8E(O2hAmpIK8ayogZx9 zHQ8}v9_Y}zQM;-YRPUUB<#JWSfcz07m!odd2 zBkfd!I7d)qS!Xn%e(mp2ldUhlh%>Q7NL{_qn$)NhUgo4Bkz-c6YLU{y z1lHwjhO2sM8lQU($depL2kaRY`2=ut`;#JhCREu-)_82qE6x zW<%ptI%k7T7j`Vpq%lXSafDNmP$V+Dw40pVWN*?CnVjNer!|bT7D=U{74bbH6CHPL zojN)%1Cq68mpCgxEa3+5wM8**a@x`{mhhS?qW*E=OE2wu;lRDLkry&*?&#dd56k}h zrlB5Ryw((u>TluJ7G!7D@>AcIg3f>WXwNQB|QfXPg}Y zz(x}y{Q$9z3-lbao;id8Hl5?*hS@%fi)axNM4e&I%)_$!d0XVvXaZUa)kHa|-tB2u zpF}R~2QQsz+KaG|8?{j1b#od*Wm9;I8vk)G$qZIkC6KInEo)mRL5a zLQCfVTq2+W{YRD3MRhRq;B8T3$nkS23%F3E$Ola5p2A#YiJG3jtLC0g8IAc8#VA9V zH_%&rD)B6*S|E1300u)&3v7D=tS65qqK2S9IjUM+E^rl!db{<=zJ-1Dg|3d^5&J0m z9Mr?J0&s+n9Mu$eQ-V5q+X|`o`#V*otLPh5zw8>`!|lXo8(@i=7)g{bHfuGu5qFWi z3N^Otjl?_)dxi57Hy3%!r7kHf@c#~=hQuB@Ly@YTD{o&dCCSD4C6bj7mib7LozNMG zs^0EPZ5k-|fFQW{kjAZynWHM*eaRO^P_1h6^yl{9?0)P!<&FK4xukCP8oqUPzjyc! zz)!^^OD-DU!ce0by+XF-6c0H1ljXSW1Jd@Y`bF>fc_4=q#e;}WZmR27|KqEv>wRNM zzJ^e|;e^QE2Yx05t|VAGJU#RcqNfL=5k5f3iE#YssQPwa&&3hOdAiIu`qNSPao=TM zS^cxG(xq{XT+vC*ObSuX-0Z0O%C+vj7%RwzO(SR$dE#`YkuH1c5vA@kMr;=>9E)g1 z?Ct(n2C6!=#uPdZv955`dqWr1Ps1nFhy4pDL9mEgY^$N`ukDR;?8SHz?OI%1jfGaof61Nz4-C5Jk_g5~qBQO5y@#>AF?h zHwOOb^X;g!g99jBY;b6No!evA3^5F{LH?ko5*dA$WL>7Jki)fIP8^hzQ-?*=_Xqng z>>h*&qdB*!{yaDcd(AhJCs%Cprx;SN-WYI4bpogb=Ef<2TtI`4@|uAt0Rx$o0lKzC zCd7xI-V{`$O$Jh-s(y9D-vtuDP$Dr2+CX6Z%nZIY6n|C29&JgMz-aK1i5&wZJ-oo* zDMlK7pl6sb^o>KU^BEfri!hnl<%6oz-|gE_alij$kVUg~Rrbp+Od^=UO+f9gvyJ;6 zst%C3DO{L~;El9=khAS@0`p;#movwaHa?POQa8c-*?S~A6;@-0AJci!n8jfG$Y|et zj=+Im5;-WFF;0Z$Tn#bk5LFt|!)Yz(>S^xt#xqIM7^fi0k}-!Ej98ECZj?ot~+r_73?? z9eh+Btb@5yA9yZcra6@aM|UJ=o_=cyS0&|=(kpdixzii;pu_Fwh#hl^{&jHa*ym}Y zj3mXTI02T!A^P&tWbAL{3T{NN+Q0&>!Cs|&-Cb})-)70d|> zT#c*^tJjBLYDKH@CcQAR42TY^Zw!yUzWqF&KFtM0$3Fr%VeJTL2RWkOI5ukj%meg6 z%q*#qu-OhjA?1=gX+H;5U^byX7;byPt%7!aH~g*U23$#{jH>RyfckReCoOu;WW(&J z8&OWQH;IPBi+Ylm_#K@Ia$W9)_#?;9O&2#HUPNTt0n@@qn$fBsQuh4?^@C_S6*`Py zLc%(`=;~H$jL8v=HU^f1HsU}bJr7Ti%{7%63Ex2z;oHoo`ejx4y3Xh{=K_2^*lX%X zBYpGRdf4de6ElV`8*o$PBP`K92%*6q4k8;rH`L@R8}-z=hn0_OZ)s33s93BAld}*T z^)0J+W7lp~*rv104^(Ky(iGUfeqqoSz| zUc=3-v1N-blh|GjFA=GN*Sb2r9|;;14_Ink80wq1+kK1b$G2~fF