diff --git a/.gitignore b/.gitignore index ed1e238..ab96a23 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .DS_Store node_modules npm-debug.log +localtest.html diff --git a/dist/showdown.js b/dist/showdown.js index e4240a3..cff5e09 100644 Binary files a/dist/showdown.js and b/dist/showdown.js differ diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 483b81d..2335ad9 100644 Binary files a/dist/showdown.js.map and b/dist/showdown.js.map differ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 2a4788f..99b1e6f 100644 Binary files a/dist/showdown.min.js and b/dist/showdown.min.js differ diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 7a42788..9da2df7 100644 Binary files a/dist/showdown.min.js.map and b/dist/showdown.min.js.map differ diff --git a/src/showdown.js b/src/showdown.js index b3e6269..7dfa015 100644 --- a/src/showdown.js +++ b/src/showdown.js @@ -17,7 +17,8 @@ var showdown = {}, strikethrough: false, tables: false, tablesHeaderId: false, - ghCodeBlocks: true // true due to historical reasons + ghCodeBlocks: true, // true due to historical reasons + tasklists: false }, globalOptions = JSON.parse(JSON.stringify(defaultOptions)); //clone default options out of laziness =P diff --git a/src/subParsers/lists.js b/src/subParsers/lists.js index ecd816f..5182837 100644 --- a/src/subParsers/lists.js +++ b/src/subParsers/lists.js @@ -42,25 +42,28 @@ showdown.subParser('lists', function (text, options, globals) { // attacklab: add sentinel to emulate \z listStr += '~0'; - /* - list_str = list_str.replace(/ - (\n)? // leading line = $1 - (^[ \t]*) // leading whitespace = $2 - ([*+-]|\d+[.]) [ \t]+ // list marker = $3 - ([^\r]+? // list item text = $4 - (\n{1,2})) - (?= \n* (~0 | \2 ([*+-]|\d+[.]) [ \t]+)) - /gm, function(){...}); - */ - var rgx = /(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+([^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm; + var rgx = /(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+((\[(x| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm; + + listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4, taskbtn, checked) { + checked = (checked && checked.trim() !== ''); - listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4) { var item = showdown.subParser('outdent')(m4, options, globals); - //m1 - LeadingLine + //m1 - LeadingLine if (m1 || (item.search(/\n{2,}/) > -1)) { item = showdown.subParser('blockGamut')(item, options, globals); } else { + if (taskbtn && options.tasklists) { + item = item.replace(taskbtn, function () { + var otp = ' -1) ? 'ul' : 'ol'; - return spl + tp + '
  • ' + item + '
    • \n'; + var tp = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol', + bulletStyle = ''; + + if (taskbtn) { + bulletStyle = ' style="list-style-type: none;"'; + } + + return spl + tp + '' + item + '\n'; }); // attacklab: strip sentinel @@ -87,6 +96,8 @@ showdown.subParser('lists', function (text, options, globals) { * @returns {string|*} */ function splitConsecutiveLists (results, listType) { + // parsing html with regex... + // This will surely fail if some extension decides to change paragraph markup directly var cthulhu = /(]+?>|

    |<\/p>)/img, holder = [[]], res = '', @@ -125,28 +136,6 @@ showdown.subParser('lists', function (text, options, globals) { text += '~0'; // Re-usable pattern to match any entire ul or ol list: - - /* - var whole_list = / - ( // $1 = whole list - ( // $2 - [ ]{0,3} // attacklab: g_tab_width - 1 - ([*+-]|\d+[.]) // $3 = first list item marker - [ \t]+ - ) - [^\r]+? - ( // $4 - ~0 // sentinel for workaround; should be $ - | - \n{2,} - (?=\S) - (?! // Negative lookahead for another list item marker - [ \t]* - (?:[*+-]|\d+[.])[ \t]+ - ) - ) - )/g - */ var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm; if (globals.gListLevel) { diff --git a/test/features/#164.4.tasklists.html b/test/features/#164.4.tasklists.html new file mode 100644 index 0000000..128e848 --- /dev/null +++ b/test/features/#164.4.tasklists.html @@ -0,0 +1,10 @@ +

    my things

    + + + +

    otherthings

    diff --git a/test/features/#164.4.tasklists.md b/test/features/#164.4.tasklists.md new file mode 100644 index 0000000..0054490 --- /dev/null +++ b/test/features/#164.4.tasklists.md @@ -0,0 +1,8 @@ +# my things + + - foo + - [] bar + - [ ] baz + - [x] bazinga + +otherthings diff --git a/test/node/showdown.js b/test/node/showdown.js index e72849b..db28ea7 100644 --- a/test/node/showdown.js +++ b/test/node/showdown.js @@ -28,7 +28,8 @@ describe('showdown.options', function () { strikethrough: false, tables: false, tablesHeaderId: false, - ghCodeBlocks: true + ghCodeBlocks: true, + tasklists: false }; expect(showdown.getDefaultOptions()).to.be.eql(opts); }); diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js index e6d60de..948fbf5 100644 --- a/test/node/testsuite.features.js +++ b/test/node/testsuite.features.js @@ -21,8 +21,10 @@ describe('makeHtml() features testsuite', function () { converter = new showdown.Converter({literalMidWordUnderscores: true}); } else if (testsuite[i].name === '#164.3.strikethrough') { converter = new showdown.Converter({strikethrough: true}); - } else if (testsuite[i].name === 'disable_gh_codeblocks') { + } else if (testsuite[i].name === 'disable_gh_codeblocks') { converter = new showdown.Converter({ghCodeBlocks: false}); + } else if (testsuite[i].name === '#164.4.tasklists') { + converter = new showdown.Converter({tasklists: true}); } else { converter = new showdown.Converter(); }