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: fallback page should use path not file location #1301

Merged
merged 4 commits into from
Aug 4, 2020

Conversation

palkan
Copy link
Contributor

@palkan palkan commented Jul 22, 2020

Summary

When resolving fallback page for the path (fallbackLanguages option), we should consider the original path, not the file location (which could be different when aliases are used).

This patch is used in this repo and "deployed" at https://test-prof.evilmartians.io/.

What kind of change does this PR introduce? (check at least one)

  • Bugfix
  • Feature
  • Code style update
  • Refactor
  • Docs
  • Build-related changes
  • Repo settings
  • Other, please describe:

If changing the UI of default theme, please provide the before/after screenshot:

Does this PR introduce a breaking change? (check one)

  • Yes
  • No

If yes, please describe the impact and migration path for existing applications:

The PR fulfills these requirements:

  • When resolving a specific issue, it's referenced in the PR's title (e.g. fix #xxx[,#xxx], where "xxx" is the issue number)

You have tested in the following browsers: (Providing a detailed version will be better.)

  • Chrome
  • Firefox
  • Safari
  • Edge
  • IE

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature
  • Related documents have been updated
  • Related tests have been updated

To avoid wasting your time, it's best to open a feature request issue first and wait for approval before working on it.

When resolving fallback page for the path (`fallbackLanguages` option), we should consider the original path, not the file location (which could be different when aliases are used).
@vercel
Copy link

vercel bot commented Jul 22, 2020

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/docsify-core/docsify-preview/o4e3vnsjx
✅ Preview: https://docsify-preview-git-fork-palkan-patch-1.docsify-core.vercel.app

@codesandbox-ci
Copy link

codesandbox-ci bot commented Jul 22, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit b896d63:

Sandbox Source
docsify-template Configuration

Copy link
Member

@anikethsaha anikethsaha left a comment

Choose a reason for hiding this comment

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

I think there is a linting issue, Can you fix that. ?
Also, it would be great to have some tests for this.

@anikethsaha anikethsaha requested a review from a team July 26, 2020 08:04
@palkan
Copy link
Contributor Author

palkan commented Jul 27, 2020

@anikethsaha Fixed linter issue.

Added a Cypress test (couldn't find any unit-level tests for these functionality 🤷🏻‍♂️).

@palkan
Copy link
Contributor Author

palkan commented Aug 3, 2020

@anikethsaha ping 🙂

anikethsaha
anikethsaha previously approved these changes Aug 3, 2020
@sy-records sy-records changed the base branch from master to develop August 4, 2020 08:50
@sy-records sy-records dismissed anikethsaha’s stale review August 4, 2020 08:50

The base branch was changed.

Copy link
Member

@sy-records sy-records left a comment

Choose a reason for hiding this comment

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

LGTM.

@anikethsaha The previous branch is wrong, if it is merged, it will be submitted to master.

@anikethsaha
Copy link
Member

coool

Thanks

@anikethsaha anikethsaha merged commit 2bceabc into docsifyjs:develop Aug 4, 2020
@palkan palkan deleted the patch-1 branch August 4, 2020 10:21
@sy-records sy-records mentioned this pull request Aug 18, 2020
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants