From 062e465902dce5d65a0c9624501654f7bea2b1d1 Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Sun, 29 Jan 2017 19:50:21 +0000 Subject: [PATCH] chore: cleanup code and comments --- dist/showdown.js | Bin 80094 -> 79714 bytes dist/showdown.js.map | Bin 233464 -> 232318 bytes dist/showdown.min.js | Bin 33537 -> 33536 bytes dist/showdown.min.js.map | Bin 36288 -> 36287 bytes src/subParsers/codeSpans.js | 13 ------------- src/subParsers/encodeAmpsAndAngles.js | 2 +- src/subParsers/encodeBackslashEscapes.js | 2 +- .../escapeSpecialCharsWithinTagAttributes.js | 5 ++--- 8 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dist/showdown.js b/dist/showdown.js index a49a0b9fd41b11280f1e0a2f9ffe3f2c2c642858..2da02768449c7f999bfcb060179ebde0c8ebdd42 100644 GIT binary patch delta 62 zcmccjk>$}lmJO$tZDw0>jD7Rj^*PLJdWv22hsC5=Z1iwP1Nvt`nn^HPBi;G*+n#=W?l$>{Rz2abPC!K}-hmIl* zh`+$0o4Yu;xGDYv@1o!h$IJJ<&-;GwpVr&A^)R0nky}b%zSbut0I)lwR>$|-&Wd>m z!BLDQCW=Z3X-`NB;)3!%k01boc~$8#U}${IB&I+_mqN${NsL8bBHM2BR|f4I(2-avUB_^E0GC20fTbAnE-*bb=}d?u zq;a2j4d|H9um6`FV@32b0>Z?AO0%|`<-jRzX@#Qm8uW&osJ`H~bLDy7wR31ZF3O&# z^QD5H-QBaIwd<9~Sz)$jWgCy9g++uEj?&J}_A-uYQ1$&FoqueuBD67AYR-d4;Q5o2(mUY9?6-}1ga17gYxPPTu5_%q1(wPZT|#0`*N(R} z$k1cGHTY8R=XwQNxH*sh2shG1pH1IP|m3EJXrrfqERQjnd1IqRvI| zU}I0><$uco=O ZE}!z6IWn?axRYgl1;Izul7*k{{sJ4Qab^Gj delta 997 zcmYk3U2GIp6vuP#%(Tl;x(l5ZC_StXrhJ}qg#*mgpg!=JXKXT2_Vlrs=ba%vc z@i=OKZ7)gAr-%r5zOBK(bt1!ROvLIl;X3 z)AG1wjO@hf_e8?PS457A&vr<_4#i>QyY2pPmV6`#2fL5JKrX{aQNVaj^z%=XJ2GF1 z1WOhdT_6%H{3hYzm)xiFHHpzmH(rU64&2;B>hMT6&H6Wc$?qbJUShDk{wQg?ew_Tt z*Y&9kvo+%TGa|nAEZGJt_Z2^Pk}L^gxZYPgse-vGN$~k(=>L2dj4aCNJjMrR>zkne zMUj^Cxc(9!u=I-p3j-45+7(05p<+6e`=C~Gf zDwaKIk28Z6O?$t`)68TAvsjucn^O~!m+|=jOmvUiG_|r0c6>wXPTR~GV@3p@e^4zt z1Ncb}zc693qBCl-LfI*nLNsX59ct;^xEMnZm0V?d9`B-T7P4%{aZAi}ooRcNm3cC# zR(70H!J3$~M?-lk{OWqE-uK_QfgLw`&h(0$8)wC`GiA9U*xcD@L=tuUl{6chwu|1R zV>hSHWHOnvsly@EqWZgkr8{C&*ZrsN)2bjok!d`KjiO+Dm=L!5St5KR_%)IMR8m#X y9LKd~+O(MmX|_Muy@59l346Av&4b~sWrUsU2;{AJ`z}@SFG<+vx5b2>H~$5n@JEvX diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 3b495b05edf0cec9ef6ff5132401307055b15628..e5d1cb86c239ac7f897d49193f53122a0b497970 100644 GIT binary patch delta 53 zcmZo{V`^w)+OWxE^JWiSMovA&I$PaXP5t!Ad2&jV?YtE?YkPGtvDMka#5UjYQ8fbq D;|>vc delta 75 zcmZo@V`^+;+OWxkFGfW%R#QJcQ%6ZHr^I@)VY$p?TMv=R?>#wn`!@SrVW<Xp4i8QDUkfO>-_pAU6XakT^*6zJ#}sFMyT|bro-7z5z1cskz#IVYkS44E diff --git a/src/subParsers/codeSpans.js b/src/subParsers/codeSpans.js index 1051c36..495b4a7 100644 --- a/src/subParsers/codeSpans.js +++ b/src/subParsers/codeSpans.js @@ -28,19 +28,6 @@ showdown.subParser('codeSpans', function (text, options, globals) { text = globals.converter._dispatch('codeSpans.before', text, options, globals); - /* - text = text.replace(/ - (^|[^\\]) // Character before opening ` can't be a backslash - (`+) // $2 = Opening run of ` - ( // $3 = The code block - [^\r]*? - [^`] // attacklab: work around lack of lookbehind - ) - \2 // Matching closer - (?!`) - /gm, function(){...}); - */ - if (typeof(text) === 'undefined') { text = ''; } diff --git a/src/subParsers/encodeAmpsAndAngles.js b/src/subParsers/encodeAmpsAndAngles.js index 227baf3..024a99a 100644 --- a/src/subParsers/encodeAmpsAndAngles.js +++ b/src/subParsers/encodeAmpsAndAngles.js @@ -10,7 +10,7 @@ showdown.subParser('encodeAmpsAndAngles', function (text, options, globals) { text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&'); // Encode naked <'s - text = text.replace(/<(?![a-z\/?\$!])/gi, '<'); + text = text.replace(/<(?![a-z\/?$!])/gi, '<'); text = globals.converter._dispatch('encodeAmpsAndAngles.after', text, options, globals); return text; diff --git a/src/subParsers/encodeBackslashEscapes.js b/src/subParsers/encodeBackslashEscapes.js index 70d0640..674e69c 100644 --- a/src/subParsers/encodeBackslashEscapes.js +++ b/src/subParsers/encodeBackslashEscapes.js @@ -14,7 +14,7 @@ showdown.subParser('encodeBackslashEscapes', function (text, options, globals) { text = globals.converter._dispatch('encodeBackslashEscapes.before', text, options, globals); text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback); - text = text.replace(/\\([`*_{}\[\]()>#+-.!~])/g, showdown.helper.escapeCharactersCallback); + text = text.replace(/\\([`*_{}\[\]()>#+.!~=-])/g, showdown.helper.escapeCharactersCallback); text = globals.converter._dispatch('encodeBackslashEscapes.after', text, options, globals); return text; diff --git a/src/subParsers/escapeSpecialCharsWithinTagAttributes.js b/src/subParsers/escapeSpecialCharsWithinTagAttributes.js index 4e01534..4a0e929 100644 --- a/src/subParsers/escapeSpecialCharsWithinTagAttributes.js +++ b/src/subParsers/escapeSpecialCharsWithinTagAttributes.js @@ -1,5 +1,5 @@ /** - * Within tags -- meaning between < and > -- encode [\ ` * _] so they + * Within tags -- meaning between < and > -- encode [\ ` * _ ~ =] so they * don't conflict with their use in Markdown for code, italics and strong. */ showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text, options, globals) { @@ -13,8 +13,7 @@ showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text, opti text = text.replace(regex, function (wholeMatch) { return wholeMatch .replace(/(.)<\/?code>(?=.)/g, '$1`') - //tag = showdown.helper.escapeCharacters(tag, '\\`*_', false); - .replace(/([\\`*_ ~=])/g, showdown.helper.escapeCharactersCallback); + .replace(/([\\`*_~=])/g, showdown.helper.escapeCharactersCallback); }); text = globals.converter._dispatch('escapeSpecialCharsWithinTagAttributes.after', text, options, globals);