Skip to content

Commit 46cbba0

Browse files
fsologurengfsologureng
committed
Change ID pattern of raw content container for issues and comments to avoid internal ID collisions. Fixes #21965.
1 parent f9cbf5a commit 46cbba0

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

‎templates/repo/diff/comments.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<span class="no-content">{{$.root.locale.Tr "repo.issues.no_content"}}</span>
5555
{{end}}
5656
</div>
57-
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
57+
<div id="issuecomment-{{.ID}}-raw" class="raw-content hide">{{.Content}}</div>
5858
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.root.RepoLink}}/comments/{{.ID}}" data-context="{{$.root.RepoLink}}"></div>
5959
</div>
6060
{{$reactions := .Reactions.GroupByType}}

‎templates/repo/issue/view_content.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
7878
{{end}}
7979
</div>
80-
<div id="comment-{{.Issue.ID}}" class="raw-content hide">{{.Issue.Content}}</div>
80+
<div id="issue-{{.Issue.ID}}-raw" class="raw-content hide">{{.Issue.Content}}</div>
8181
<div class="edit-content-zone hide" data-write="issue-{{.Issue.ID}}-write" data-preview="issue-{{.Issue.ID}}-preview" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/content" data-context="{{.RepoLink}}" data-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/attachments" data-view-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/view-attachments"></div>
8282
{{if .Issue.Attachments}}
8383
{{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}}

‎templates/repo/issue/view_content/comments.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<span class="no-content">{{$.locale.Tr "repo.issues.no_content"}}</span>
7878
{{end}}
7979
</div>
80-
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
80+
<div id="issuecomment-{{.ID}}-raw" class="raw-content hide">{{.Content}}</div>
8181
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
8282
{{if .Attachments}}
8383
{{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}}
@@ -449,7 +449,7 @@
449449
<span class="no-content">{{$.locale.Tr "repo.issues.no_content"}}</span>
450450
{{end}}
451451
</div>
452-
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
452+
<div id="issuecomment-{{.ID}}-raw" class="raw-content hide">{{.Content}}</div>
453453
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
454454
{{if .Attachments}}
455455
{{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}}
@@ -576,7 +576,7 @@
576576
<span class="no-content">{{$.locale.Tr "repo.issues.no_content"}}</span>
577577
{{end}}
578578
</div>
579-
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
579+
<div id="issuecomment-{{.ID}}-raw" class="raw-content hide">{{.Content}}</div>
580580
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
581581
</div>
582582
{{$reactions := .Reactions.GroupByType}}

‎templates/repo/issue/view_content/context_menu.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
{{$referenceUrl = Printf "%s/files#%s" .ctx.Issue.HTMLURL .item.HashTag}}
1212
{{end}}
1313
<div class="item context" data-clipboard-text="{{$referenceUrl}}">{{.ctx.locale.Tr "repo.issues.context.copy_link"}}</div>
14-
<div class="item context quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.ID}}">{{.ctx.locale.Tr "repo.issues.context.quote_reply"}}</div>
14+
<div class="item context quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.HashTag}}-raw">{{.ctx.locale.Tr "repo.issues.context.quote_reply"}}</div>
1515
{{if not .ctx.UnitIssuesGlobalDisabled}}
16-
<div class="item context reference-issue" data-target="{{.item.ID}}" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceUrl}}">{{.ctx.locale.Tr "repo.issues.context.reference_issue"}}</div>
16+
<div class="item context reference-issue" data-target="{{.item.HashTag}}-raw" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceUrl}}">{{.ctx.locale.Tr "repo.issues.context.reference_issue"}}</div>
1717
{{end}}
1818
{{if or .ctx.Permission.IsAdmin .IsCommentPoster .ctx.HasIssuesOrPullsWritePermission}}
1919
<div class="divider"></div>

‎web_src/js/features/repo-issue.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ export function initRepoIssueReferenceIssue() {
553553
const $this = $(this);
554554
$this.closest('.dropdown').find('.menu').toggle('visible');
555555

556-
const content = $(`#comment-${$this.data('target')}`).text();
556+
const content = $(`#${$this.data('target')}`).text();
557557
const poster = $this.data('poster-username');
558558
const reference = $this.data('reference');
559559
const $modal = $($this.data('modal'));

‎web_src/js/features/repo-legacy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ function initRepoIssueCommentEdit() {
566566
$(document).on('click', '.quote-reply', function (event) {
567567
$(this).closest('.dropdown').find('.menu').toggle('visible');
568568
const target = $(this).data('target');
569-
const quote = $(`#comment-${target}`).text().replace(/\n/g, '\n> ');
569+
const quote = $(`#${target}`).text().replace(/\n/g, '\n> ');
570570
const content = `> ${quote}\n\n`;
571571
let easyMDE;
572572
if ($(this).hasClass('quote-reply-diff')) {

0 commit comments

Comments
 (0)