Skip to content

Fix handling of adjacent lists. - #684

Merged
styfle merged 1 commit into
markedjs:masterfrom
kohler:adjacentlists
Dec 10, 2018
Merged

Fix handling of adjacent lists.#684
styfle merged 1 commit into
markedjs:masterfrom
kohler:adjacentlists

Conversation

@kohler

@kohlerkohler commented Nov 16, 2015

Copy link
Copy Markdown
Contributor

An ordered list followed by an unordered list shouldn't be combined, even in non-smartLists mode.

Should fix#530.

@janhui

janhui commented Jul 5, 2016

Copy link
Copy Markdown

Would it be possible to merge this in? it does fix #530

@TrottTrott mentioned this pull request Jul 3, 2018
Closed
3 tasks
@UziTech

UziTech commented Dec 5, 2018

Copy link
Copy Markdown
Member

I would like to get this PR merged @kohler would you be able to merge the current master so the tests will run? Or would you like me to do it in a new PR?

@kohler

kohler commented Dec 6, 2018

Copy link
Copy Markdown
ContributorAuthor

I updated. I didn't check in the minified file though—not sure what you prefer there (or what Travis expects).

UziTech
UziTech requested changes Dec 6, 2018
View reviewed changes

@UziTechUziTech left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like travis is failing because of linting

/home/travis/build/markedjs/marked/lib/marked.js
360:42 error Expected '===' and instead saw '==' eqeqeq
361:1 warning Expected indentation of 12 spaces but found 14 indent

Comment threadtest/new/adjacent_lists.text
Comment threadtest/tests/adjacent_lists.text Outdated
@UziTech

UziTech commented Dec 6, 2018

Copy link
Copy Markdown
Member

Travis will update the minified file automatically when this PR is merged

@kohler
Fix handling of adjacent lists.
a48a9f0
An ordered list followed by an unordered list shouldn't be combined,
even in non-smartLists mode.
Should fixmarkedjs#530.
@kohler
kohlerforce-pushed the adjacentlists branch 3 times, most recently from 58c8e75 to a48a9f0CompareDecember 10, 2018 16:34
@kohler

kohler commented Dec 10, 2018

Copy link
Copy Markdown
ContributorAuthor

Travis no longer complains and I changed the tests as requested.

@UziTech

UziTech commented Dec 10, 2018

Copy link
Copy Markdown
Member

Nice 🎉.

We will just need one more approval from the markedjs team.
/cc @styfle@joshbruce@davisjam

styfle
styfle approved these changes Dec 10, 2018
View reviewed changes

@styflestyfle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonderful, thanks for fixing these pesky lists! 🎉

@styfle
styfle merged commit 2d94bf3 into markedjs:masterDec 10, 2018
@snyk-botsnyk-bot mentioned this pull request Aug 19, 2019
Open
This was referenced Aug 30, 2019
Open
Open
@snyk-botsnyk-bot mentioned this pull request Sep 24, 2019
Open
This was referenced Oct 26, 2019
Open
Open
Open
Closed
Open
@snyk-botsnyk-bot mentioned this pull request Nov 4, 2019
Open
This was referenced Nov 18, 2019
Open
Open
@yogansnykgityogansnykgit mentioned this pull request Oct 25, 2024
Open
@shad0w92shad0w92 mentioned this pull request Oct 26, 2024
Open
@shyamaaronshyamaaron mentioned this pull request Oct 26, 2024
Open
@Gowtham3223108Gowtham3223108 mentioned this pull request Oct 26, 2024
Open
@udayreddy026udayreddy026 mentioned this pull request Oct 26, 2024
Open
@moamed-syedmoamed-syed mentioned this pull request Oct 27, 2024
Open
@ManPrivateManPrivate mentioned this pull request Oct 27, 2024
Closed
@tdsnyktdsnyk mentioned this pull request Oct 28, 2024
Open
@sri-sankarisri-sankari mentioned this pull request Oct 28, 2024
Open
@mohankumar931mohankumar931 mentioned this pull request Oct 28, 2024
Open
@sound25sound25 mentioned this pull request Oct 29, 2024
Open
@Latha-lgtmLatha-lgtm mentioned this pull request Oct 29, 2024
Open
@GOWTHAMAKURINJIVEANDANGOWTHAMAKURINJIVEANDAN mentioned this pull request Oct 29, 2024
Open
@Dejah2024Dejah2024 mentioned this pull request Oct 30, 2024
Open
@ThiruVaithiyaThiruVaithiya mentioned this pull request Oct 30, 2024
Open
@Suriya0802Suriya0802 mentioned this pull request Oct 30, 2024
Open
@Shriv12Shriv12 mentioned this pull request Oct 30, 2024
Open
@Magali0007Magali0007 mentioned this pull request Oct 31, 2024
Open
@Ganesh13349Ganesh13349 mentioned this pull request Oct 31, 2024
Open
@sinnakkrishnansinnakkrishnan mentioned this pull request Nov 1, 2024
Open
@krithika-manoharkrithika-manohar mentioned this pull request Nov 1, 2024
Open
@SAGAYANELSON55SAGAYANELSON55 mentioned this pull request Nov 1, 2024
Open
@swathi-raswathi-ra mentioned this pull request Nov 2, 2024
Open
@HUGO-AppSecHUGO-AppSec mentioned this pull request Nov 3, 2024
Open
@danielsb74danielsb74 mentioned this pull request Nov 5, 2024
Open
@selvaganesh26selvaganesh26 mentioned this pull request Nov 5, 2024
Open
@merkeldevmerkeldev mentioned this pull request Nov 5, 2024
Open
@joedean-gitjoedean-git mentioned this pull request Nov 9, 2024
Open
@MimiDas-SnykMimiDas-Snyk mentioned this pull request Nov 10, 2024
Open
@BenDrKoBenDrKo mentioned this pull request Nov 11, 2024
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UziTechUziTechUziTech approved these changes
@styflestyflestyfle approved these changes

Assignees

No one assigned

Labels

category: lists

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Weird list rendering behavior

5 participants

@kohler@janhui@UziTech@styfle@joshbruce