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(paginator): compatibility with hexo-util@1.3.0 #3728

Merged
merged 6 commits into from Sep 27, 2019

Conversation

@curbengh
Copy link
Contributor

curbengh commented Sep 22, 2019

What does it do?

htmlTag in hexo-util@1.3.0 onward escape html tag and encode url by default. This PR adds trailing slash to expected value of href; trailing slash is added by encodeURL() of html-util.

In paginator helper,

  • spaceHtml is not escaped to avoid double escaping the '…'.
  • add escape option (enabled by default). Closes #3729

How to test

git clone -b escape-html https://github.com/curbengh/hexo.git
cd hexo
npm install
npm test

Pull request tasks

  • Add test cases for the changes.
  • Passed the CI test.
curbengh added 5 commits Sep 20, 2019
Revert 38f0690
@coveralls

This comment has been minimized.

Copy link

coveralls commented Sep 22, 2019

Coverage Status

Coverage remained the same at 97.248% when pulling 6fd5231 on curbengh:escape-html into 53ebe22 on hexojs:master.

@curbengh

This comment has been minimized.

Copy link
Contributor Author

curbengh commented Sep 22, 2019

@curbengh

This comment has been minimized.

Copy link
Contributor Author

curbengh commented Sep 23, 2019

@curbengh curbengh added this to To do in v4.0.0 Sep 26, 2019
@curbengh curbengh marked this pull request as ready for review Sep 27, 2019
@curbengh

This comment has been minimized.

Copy link
Contributor Author

curbengh commented Sep 27, 2019

Ready

@curbengh curbengh requested a review from hexojs/core Sep 27, 2019
@curbengh curbengh changed the title fix: compatibility with hexo-util@1.3.0 fix(paginator): compatibility with hexo-util@1.3.0 Sep 27, 2019
@SukkaW
SukkaW approved these changes Sep 27, 2019
v4.0.0 automation moved this from To do to In progress Sep 27, 2019
@curbengh curbengh merged commit ffe4eaa into hexojs:master Sep 27, 2019
3 of 4 checks passed
3 of 4 checks passed
codeclimate 2 issues to fix
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage remained the same at 97.248%
Details
v4.0.0 automation moved this from In progress to Done Sep 27, 2019
@curbengh curbengh deleted the curbengh:escape-html branch Sep 27, 2019
DIYgod added a commit to DIYgod/diygod.me that referenced this pull request Oct 18, 2019
@curbengh curbengh mentioned this pull request Oct 24, 2019
1 of 15 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
v4.0.0
  
Done
3 participants
You can’t perform that action at this time.