From e3a4541ab395ef957e58061947aa576b1b544239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Sat, 30 May 2015 00:10:21 +0100 Subject: [PATCH] Revert "fix(suparsbers/lists.js): fix odd behavior for multiple consecutive lists" This reverts commit 11f32e04a60890112f719ba872ba5d0f555cef45. --- dist/showdown.js | Bin 47368 -> 47388 bytes dist/showdown.js.map | Bin 154369 -> 154389 bytes test/cases/nested-lists.html | 19 ------------------ test/cases/nested-lists.md | 17 ---------------- test/extra/break-two-lists.html | 8 -------- test/extra/break-two-lists.md | 6 ------ ...aviour_for_multiple_consecutive_lists.html | 8 -------- ...ehaviour_for_multiple_consecutive_lists.md | 5 ----- test/node/Container/testMakeHtml.js | 15 ++++---------- 9 files changed, 4 insertions(+), 74 deletions(-) delete mode 100644 test/cases/nested-lists.html delete mode 100644 test/cases/nested-lists.md delete mode 100644 test/extra/break-two-lists.html delete mode 100644 test/extra/break-two-lists.md delete mode 100644 test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html delete mode 100644 test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.md diff --git a/dist/showdown.js b/dist/showdown.js index 412d2391897981f4eb996a9ac3bf9759b11db4a6..77b63da86e519d8850c1862365045c127467a21f 100644 GIT binary patch delta 63 zcmeD9#5Csy5#hB-_zMw{o%SPx>QB)@U5}w>pz{=>pT`QC^@ELPVjM4TEYo@QvK$h|LE_ -
  • foo
  • -
  • bar -
    • baz -
      • bazinga
    • -
    • nhecos
  • -
  • bada
  • - - -

    separator

    - -
      -
    • foo
    • -
    • bar -
      1. baz -
        • bazinga
      2. -
      3. nhecos
    • -
    • bada
    • -
    \ No newline at end of file diff --git a/test/cases/nested-lists.md b/test/cases/nested-lists.md deleted file mode 100644 index 575f12e..0000000 --- a/test/cases/nested-lists.md +++ /dev/null @@ -1,17 +0,0 @@ - - foo - - bar - - baz - - bazinga - - nhecos - - bada - -separator - - - foo - - bar - 1. baz - + bazinga - 2. nhecos - - bada - - diff --git a/test/extra/break-two-lists.html b/test/extra/break-two-lists.html deleted file mode 100644 index e6ca0dd..0000000 --- a/test/extra/break-two-lists.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
    • foo
    • -
    • bar
    • -
    -
      -
    • baz
    • -
    • bazinga
    • -
    \ No newline at end of file diff --git a/test/extra/break-two-lists.md b/test/extra/break-two-lists.md deleted file mode 100644 index ebef148..0000000 --- a/test/extra/break-two-lists.md +++ /dev/null @@ -1,6 +0,0 @@ - - foo - - bar - - - - baz - - bazinga diff --git a/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html b/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html deleted file mode 100644 index 0485179..0000000 --- a/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html +++ /dev/null @@ -1,8 +0,0 @@ -
      -
    • Item 1
    • -
    • Item 2
    • -
    -
      -
    1. Item 1
    2. -
    3. Item 2
    4. -
    \ No newline at end of file diff --git a/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.md b/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.md deleted file mode 100644 index f7af059..0000000 --- a/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.md +++ /dev/null @@ -1,5 +0,0 @@ -* Item 1 -* Item 2 - -1. Item 1 -2. Item 2 diff --git a/test/node/Container/testMakeHtml.js b/test/node/Container/testMakeHtml.js index 4cd066e..be479ee 100644 --- a/test/node/Container/testMakeHtml.js +++ b/test/node/Container/testMakeHtml.js @@ -15,26 +15,19 @@ .map(map('test/cases/')), issues = fs.readdirSync('test/issues/') .filter(filter()) - .map(map('test/issues/')), - extra = fs.readdirSync('test/extra/') - .filter(filter()) - .map(map('test/extra/')); + .map(map('test/issues/')); //Tests describe('Converter.makeHtml() simple testcases', function () { var converter = new showdown.Converter(); for (var i = 0; i < cases.length; ++i) { + if (cases[i].name === 'github-style-at-start') { + console.log(showdown.getOptions()); + } it(cases[i].name, assertion(cases[i], converter)); } }); - describe('Converter.makeHtml() EXTRA testcases', function () { - var converter = new showdown.Converter(); - for (var i = 0; i < extra.length; ++i) { - it(extra[i].name, assertion(extra[i], converter)); - } - }); - describe('Converter.makeHtml() issues testcase', function () { var converter = new showdown.Converter(); for (var i = 0; i < issues.length; ++i) {