Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix handling of adjacent lists. #684

Merged
merged 1 commit into from
Dec 10, 2018
Merged

Fix handling of adjacent lists. #684

merged 1 commit into from
Dec 10, 2018

Conversation

kohler
Copy link
Contributor

@kohler kohler commented Nov 16, 2015

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

Should fix #530.

@janhui
Copy link

janhui commented Jul 5, 2016

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

@Trott Trott mentioned this pull request Jul 3, 2018
Closed
3 tasks
@UziTech
Copy link
Member

UziTech commented Dec 5, 2018

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
Copy link
Contributor Author

kohler commented Dec 6, 2018

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
Copy link
Member

@UziTech UziTech left a comment

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

test/new/adjacent_lists.text Outdated Show resolved Hide resolved
test/tests/adjacent_lists.text Outdated Show resolved Hide resolved
@UziTech
Copy link
Member

UziTech commented Dec 6, 2018

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 fix markedjs#530.
@kohler kohler force-pushed the adjacentlists branch 3 times, most recently from 58c8e75 to a48a9f0 Compare December 10, 2018 16:34
@kohler
Copy link
Contributor Author

kohler commented Dec 10, 2018

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

@UziTech
Copy link
Member

UziTech commented Dec 10, 2018

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
Copy link
Member

@styfle styfle left a comment

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:master Dec 10, 2018
@snyk-bot snyk-bot mentioned this pull request Aug 19, 2019
Open
This was referenced Aug 30, 2019
Open
Open
@snyk-bot snyk-bot mentioned this pull request Sep 24, 2019
Open
This was referenced Oct 26, 2019
Open
Open
Open
Closed
Open
Closed
@snyk-bot snyk-bot mentioned this pull request Nov 4, 2019
Open
@sri-sankari sri-sankari mentioned this pull request Oct 28, 2024
Open
@mohankumar931 mohankumar931 mentioned this pull request Oct 28, 2024
Open
@foolcardssk foolcardssk mentioned this pull request Oct 29, 2024
Open
@arunnsm arunnsm mentioned this pull request Oct 29, 2024
Open
@sound25 sound25 mentioned this pull request Oct 29, 2024
Open
@Latha-lgtm Latha-lgtm mentioned this pull request Oct 29, 2024
Open
@GOWTHAMAKURINJIVEANDAN GOWTHAMAKURINJIVEANDAN mentioned this pull request Oct 29, 2024
Open
@Dejah2024 Dejah2024 mentioned this pull request Oct 30, 2024
Open
@ThiruVaithiya ThiruVaithiya mentioned this pull request Oct 30, 2024
Open
@Upender5119 Upender5119 mentioned this pull request Oct 30, 2024
Open
@Suriya0802 Suriya0802 mentioned this pull request Oct 30, 2024
Open
@Shriv12 Shriv12 mentioned this pull request Oct 30, 2024
Open
@Magali0007 Magali0007 mentioned this pull request Oct 31, 2024
Open
@sureshrtech1 sureshrtech1 mentioned this pull request Oct 31, 2024
Open
@Praganya03 Praganya03 mentioned this pull request Oct 31, 2024
Open
@Ganesh13349 Ganesh13349 mentioned this pull request Oct 31, 2024
Open
@robertnorrie robertnorrie mentioned this pull request Oct 31, 2024
Open
@sinnakkrishnan sinnakkrishnan mentioned this pull request Nov 1, 2024
Open
@Vijay-2302 Vijay-2302 mentioned this pull request Nov 1, 2024
Open
@krithika-manohar krithika-manohar mentioned this pull request Nov 1, 2024
Open
@SAGAYANELSON55 SAGAYANELSON55 mentioned this pull request Nov 1, 2024
Open
@swathi-ra swathi-ra mentioned this pull request Nov 2, 2024
Open
@austinskou austinskou mentioned this pull request Nov 3, 2024
Open
@BD-HUGO BD-HUGO mentioned this pull request Nov 3, 2024
Open
@danielsb74 danielsb74 mentioned this pull request Nov 5, 2024
Open
@selvaganesh26 selvaganesh26 mentioned this pull request Nov 5, 2024
Open
@merkeldev merkeldev mentioned this pull request Nov 5, 2024
Open
@joedean-git joedean-git mentioned this pull request Nov 9, 2024
Open
@MimiDas-Snyk MimiDas-Snyk mentioned this pull request Nov 10, 2024
Open
@BenDrKo BenDrKo mentioned this pull request Nov 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@styfle styfle styfle approved these changes

@UziTech UziTech UziTech 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
4 participants
@kohler @janhui @UziTech @styfle