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.

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

Fix handling of adjacent lists. #684

Merged
merged 1 commit into from Dec 10, 2018

Conversation

@kohler
Copy link
Contributor

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

This comment has been minimized.

Copy link

commented Jul 5, 2016

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

@joshbruce joshbruce added this to Queue in PRs Dec 1, 2017

@Trott Trott referenced this pull request Jul 3, 2018
3 of 3 tasks complete
@UziTech

This comment has been minimized.

Copy link
Member

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 kohler force-pushed the kohler:adjacentlists branch from 4bbf9cc to 58c8e75 Dec 6, 2018

@kohler

This comment has been minimized.

Copy link
Contributor Author

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

left a comment

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

This comment has been minimized.

Copy link
Member

commented Dec 6, 2018

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

@kohler kohler force-pushed the kohler:adjacentlists branch from 58c8e75 to 5746f36 Dec 10, 2018

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

Should fix #530.

@kohler kohler force-pushed the kohler:adjacentlists branch 3 times, most recently from 58c8e75 to a48a9f0 Dec 10, 2018

@kohler

This comment has been minimized.

Copy link
Contributor Author

commented Dec 10, 2018

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

@UziTech

This comment has been minimized.

Copy link
Member

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

Copy link
Member

left a comment

Wonderful, thanks for fixing these pesky lists! 🎉

@styfle styfle merged commit 2d94bf3 into markedjs:master Dec 10, 2018

3 checks passed

WIP Ready for review
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
security/snyk - package.json (markedjsbot) No known issues
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
4 participants
You can’t perform that action at this time.