-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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 user-defined markup links targets #29305
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Feb 21, 2024
pull-request-size
bot
added
the
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
label
Feb 21, 2024
silverwind
reviewed
Feb 21, 2024
silverwind
reviewed
Feb 21, 2024
silverwind
reviewed
Feb 21, 2024
Oh and let's give the PR a proper description... |
silverwind
changed the title
Fix pre-existing markup links href
Fix pre-existing markup links hrefs
Feb 22, 2024
@silverwind Do you think I need to add any more changes to this PR? |
silverwind
reviewed
Mar 5, 2024
Did some style tweaks and added some explanatory comments to the file. Works as expected but I think above code block can be removed as we can just let those links work natively after the |
silverwind
changed the title
Fix pre-existing markup links hrefs
Fix user-defined markup links targets
Mar 5, 2024
silverwind
approved these changes
Mar 7, 2024
GiteaBot
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Mar 7, 2024
delvh
approved these changes
Mar 8, 2024
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
Mar 8, 2024
silverwind
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Mar 8, 2024
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Mar 8, 2024
This seeks to fix the bug reported on issue go-gitea#29196. Cause: ID's with custom characters (- , _ , etc.), were not linking correctly in the Markdown file when rendered in the browser because the ID in the respective destinies would be different than the one in anchor, while for IDs with only letters, the ID would be the same. Fix: It was suggested that to fix this bug, it should more or less like GitHub does it. While in gitea the anchors would be put in HTML like this: ``` <p dir="auto"><a href="#user-content-_toc152597800" rel="nofollow">Review</a></p> <p dir="auto"><a href="#user-content-_toc152597802" rel="nofollow">Staging</a></p> <p dir="auto"><a href="#user-content-_toc152597803" rel="nofollow">Development</a></p> <p dir="auto"><a href="#user-content-_toc152597828" rel="nofollow">Testing</a></p> <p dir="auto"><a href="#user-content-_toc152597829" rel="nofollow">Unit-tests</a></p> ``` In GitHub, the same anchor's href properties would be the same without "user-content-" trailing behind. So my code made sure to change those anchors, so it would not include "user-content-" and then add respective Event Listeners so it would scroll into the supposed places. Fixes: go-gitea#29196 --------- Co-authored-by: silverwind <me@silverwind.io>
GiteaBot
added
backport/done
All backports for this PR have been created
and removed
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
labels
Mar 8, 2024
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Mar 8, 2024
* giteaofficial/main: Add cache for branch divergence on branch list page (go-gitea#29577) Fix user-defined markup links targets (go-gitea#29305) Don't show AbortErrors on logout (go-gitea#29639) Style fomantic grey labels (go-gitea#29458) Don't use `<br />` in alert block (go-gitea#29650) Fix incorrect rendering csv file when file size is larger than UI.CSV.MaxFileSize (go-gitea#29653) Set user's 24h preference from their current OS locale (go-gitea#29651) Move get/set default branch from git package to gitrepo package to hide repopath (go-gitea#29126) Make runs-on support variable expression (go-gitea#29468)
silverwind
added a commit
that referenced
this pull request
Mar 8, 2024
Backport #29305 by @DanielMatiasCarvalho This seeks to fix the bug reported on issue #29196. Cause: ID's with custom characters (- , _ , etc.), were not linking correctly in the Markdown file when rendered in the browser because the ID in the respective destinies would be different than the one in anchor, while for IDs with only letters, the ID would be the same. Fix: It was suggested that to fix this bug, it should more or less like GitHub does it. While in gitea the anchors would be put in HTML like this: ``` <p dir="auto"><a href="#user-content-_toc152597800" rel="nofollow">Review</a></p> <p dir="auto"><a href="#user-content-_toc152597802" rel="nofollow">Staging</a></p> <p dir="auto"><a href="#user-content-_toc152597803" rel="nofollow">Development</a></p> <p dir="auto"><a href="#user-content-_toc152597828" rel="nofollow">Testing</a></p> <p dir="auto"><a href="#user-content-_toc152597829" rel="nofollow">Unit-tests</a></p> ``` In GitHub, the same anchor's href properties would be the same without "user-content-" trailing behind. So my code made sure to change those anchors, so it would not include "user-content-" and then add respective Event Listeners so it would scroll into the supposed places. Fixes: #29196 Co-authored-by: DC <106393991+DanielMatiasCarvalho@users.noreply.github.com> Co-authored-by: silverwind <me@silverwind.io>
silverwind
added a commit
that referenced
this pull request
Mar 8, 2024
Followup #29305. As per discussion in #29666 (comment), make this selector only search in the current `.markup` document, as there can be multiples displayed at the same time. @DanielMatiasCarvalho maybe you can review.
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Mar 8, 2024
Followup go-gitea#29305. As per discussion in go-gitea#29666 (comment), make this selector only search in the current `.markup` document, as there can be multiples displayed at the same time. @DanielMatiasCarvalho maybe you can review.
silverwind
added a commit
that referenced
this pull request
Mar 9, 2024
Backport #29679 by @silverwind Followup #29305. As per discussion in #29666 (comment), make this selector only search in the current `.markup` document, as there can be multiples displayed at the same time. @DanielMatiasCarvalho maybe you can review. Co-authored-by: silverwind <me@silverwind.io>
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Mar 13, 2024
Backport #29679 by @silverwind Followup go-gitea/gitea#29305. As per discussion in go-gitea/gitea#29666 (comment), make this selector only search in the current `.markup` document, as there can be multiples displayed at the same time. @DanielMatiasCarvalho maybe you can review. Co-authored-by: silverwind <me@silverwind.io> (cherry picked from commit 25b0c99a41e9024d439deaa55be7ba87f6cd557f)
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Mar 13, 2024
Followup go-gitea/gitea#29305. As per discussion in go-gitea/gitea#29666 (comment), make this selector only search in the current `.markup` document, as there can be multiples displayed at the same time. @DanielMatiasCarvalho maybe you can review. (cherry picked from commit baeb2511741aa70d24a48fd46db936b52be9d9dd)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport/done
All backports for this PR have been created
backport/v1.21
This PR should be backported to Gitea 1.21
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
type/bug
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This seeks to fix the bug reported on issue #29196.
Cause:
ID's with custom characters (- , _ , etc.), were not linking correctly in the Markdown file when rendered in the browser because the ID in the respective destinies would be different than the one in anchor, while for IDs with only letters, the ID would be the same.
Fix:
It was suggested that to fix this bug, it should more or less like GitHub does it. While in gitea the anchors would be put in HTML like this:
In GitHub, the same anchor's href properties would be the same without "user-content-" trailing behind.
So my code made sure to change those anchors, so it would not include "user-content-" and then add respective Event Listeners so it would scroll into the supposed places.
Fixes: #29196