From 51e46933a483fb9324ac83c0751f5162833d2ebb Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Fri, 4 Aug 2017 20:19:15 +0100 Subject: [PATCH] fix(tablesHeaderId): fix missmatch of option name In code, the option appeared both as 'tableHeaderId' and 'tablesHeaderId', although only the first form had effect. In documentation was referenced as 'tablesHeaderId'. Option is now fixed in code to reflex the documentation and table parser accepts both forms, with and without an s. Closes #412 --- dist/showdown.js | Bin 89952 -> 90230 bytes dist/showdown.js.map | Bin 260620 -> 261331 bytes dist/showdown.min.js | Bin 37828 -> 37918 bytes dist/showdown.min.js.map | Bin 40137 -> 40227 bytes src/subParsers/tables.js | 3 ++- test/node/testsuite.features.js | 2 +- 6 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/showdown.js b/dist/showdown.js index fc72478084eb25a49859eb15a31900dbdebea0b0..75874b3b27e59af7f253896a11a1de818a92ae46 100644 GIT binary patch delta 221 zcmaE`kM-LDR$*&>Ek%XmjQsMH{PH{n0~1{Xi;co!)0uR*CR@&yo$NG6XL7+D4aVBZ zTGKTrADSb)Ibyox&U$@)h2qkJg8ZTqg{1tF426=!q@2`ZkJQAJ)FRImg~YrRh!9*P zr8HHcBwr!5s3^ZkAu~@QB|o_|H#M&$Ge1wEIA5VW6)2LY4m7POH8EQuDKR;_Jh3RH tSRpw-w;-`3GbuACv!s$s0SGeF6f~sr3qU%H_0a6CsZrQo8o>CP4*;rjPs{)S delta 52 zcmV-40L%aOzy;vG1rs|jDj^_qXm599Z+C7WFgGnQHn9^HmjOGIotG)I)R!K)1Zid< KD7TAI0qYL>WfK$t diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 3bb03985b9771d380b8dabe756aea51182a43466..507224d89cc8b9151854b09f22e3b289c9ea6b2d 100644 GIT binary patch delta 484 zcmZ9GJ!=$E6o$F?W*`}qA+sO4yWpM}!F;ScCY_|&F+ny$Dh;9p+`BttG9-KNFf&UG zBxbcRO$zZAr*jQ9rVuPNTiC3BKneZ;Q(2@^QN+%>1X6g)=RD^<@9r<_%U`Sgj{M9G zEV}NZdOVa-&%8mL8zT1eTLym55)+R`NKP%!*!Xgbnku|$s<&AKFI^-yeK?CFlw|Nv zj@-lES(4T(6Tu@XtTi=1D$%q8dq92tk-^Gul1DK?rm=F3HkosyiiZoNs1_bs*fxlz z;Dx!KaaB#esoysV1n)UwjBrJRv5}Cfx1jqAmQ~jKd$=R z^P_nWxbRNUDe+o9Boh26k`V*~JlSY9eUSuGKrCV1*F;>_X_3!Yq0Sqt>pb#eXvk*B ilb{}~1`-8aYVzV#22*rG`Q delta 199 zcmV;&0672C`45cr4}i1*@)-n8K|xKEA)ghKaO4@2P)`MyuT=sCmw-(H1(#5Q0t%PF z4FMRJAoKwclMt*Am*9E<50_wS0SE#wM3-M10muV0Mo5!kG!>H|rV5iyeh-&`1pyC} zAV3O-aU21+aU22?RF^P20R@-v76A&Eja~v5lf(NLlOUxJmvF)X8MnZ30xcE-a7mXj zpaCzFp!gJ%AQB3bAf^hJz^MTWw@`=zD5C*8m+~tEEVnEy1FpcAR_y~3w}I^gQV*lc BL}CB{ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index e396e6ccdad31a8a444222f9679884fbf4c98017..cdcbe50545f8801b04980b575c885d79db5bd716 100644 GIT binary patch delta 147 zcmX@IoN3+)CLw(-MTO#w{PL9i@;n6t6I}y~jY10cY-Nc>3K_PO-R+h6buw+0l&p(V zOG=CK6q58NKjadb%;_X2nXIjDlce`bn?3MYo)s^hjwbQhfZ1fZDlxim{y2x(6V;^Qa*|^r6k!y2S?R!4{B)yWvq?}Zb Q)Wnq3BF~h~H9d>i0hhib;{X5v diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 9ae0b62e2343ff2d620b0df4d26796cbae71a7ca..276717b9d23f74d0921f5f6e1a9ec27b0e24aef6 100644 GIT binary patch delta 7670 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 diff --git a/src/subParsers/tables.js b/src/subParsers/tables.js index dcd74c9..6ce7bc6 100644 --- a/src/subParsers/tables.js +++ b/src/subParsers/tables.js @@ -22,7 +22,8 @@ showdown.subParser('tables', function (text, options, globals) { function parseHeaders (header, style) { var id = ''; header = header.trim(); - if (options.tableHeaderId) { + // support both tablesHeaderId and tableHeaderId due to error in documention so we don't break backwards compatibility + if (options.tablesHeaderId || options.tableHeaderId) { id = ' id="' + header.replace(/ /g, '_').toLowerCase() + '"'; } header = showdown.subParser('spanGamut')(header, options, globals); diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js index b538ad9..b4234ad 100644 --- a/test/node/testsuite.features.js +++ b/test/node/testsuite.features.js @@ -97,7 +97,7 @@ describe('makeHtml() features testsuite', function () { suite = tableSuite; for (var i = 0; i < suite.length; ++i) { if (suite[i].name === 'basic-with-header-ids') { - converter = new showdown.Converter({tables: true, tableHeaderId: true}); + converter = new showdown.Converter({tables: true, tablesHeaderId: true}); } else if (suite[i].name === '#179.parse-md-in-table-ths') { converter = new showdown.Converter({tables: true, strikethrough: true}); } else {