-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Do not show arrows on comment diffs on pull comment pages (#12434)
* Do not show arrows on comment diffs on pull comment pages Prior to this PR it was possible that an expansion arrow could be displayed on comment diffs displayed on the comments pages of pulls These arrows would not successfully work because they were not attached to a commit id - nor can they necessarily be. This PR prevents these from being shown. Fix #10851 Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @silverwind Signed-off-by: Andrew Thornton <art27@cantab.net> * one more indentation fix Signed-off-by: Andrew Thornton <art27@cantab.net> * one more indentation fix Signed-off-by: Andrew Thornton <art27@cantab.net>
- Loading branch information
Showing
1 changed file
with
68 additions
and
66 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,77 @@ | ||
| {{$file := .file}} | ||
| {{range $j, $section := $file.Sections}} | ||
| {{range $k, $line := $section.Lines}} | ||
| <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> | ||
| {{if eq .GetType 4}} | ||
| <td colspan="2" class="lines-num"> | ||
| {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} | ||
| <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=down" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> | ||
| {{svg "octicon-fold-down" 16}} | ||
| </a> | ||
| {{if or $.root.AfterCommitID (ne .GetType 4)}} | ||
| <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> | ||
| {{if eq .GetType 4}} | ||
| <td colspan="2" class="lines-num"> | ||
| {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} | ||
| <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=down" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> | ||
| {{svg "octicon-fold-down" 16}} | ||
| </a> | ||
| {{end}} | ||
| {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} | ||
| <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=up" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> | ||
| {{svg "octicon-fold-up" 16}} | ||
| </a> | ||
| {{end}} | ||
| {{if eq $line.GetExpandDirection 2}} | ||
| <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> | ||
| {{svg "octicon-fold" 16}} | ||
| </a> | ||
| {{end}} | ||
| </td> | ||
| {{else}} | ||
| <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}"></span></td> | ||
| <td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}"></span></td> | ||
| {{end}} | ||
| {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} | ||
| <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=up" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> | ||
| {{svg "octicon-fold-up" 16}} | ||
| </a> | ||
| <td class="lines-type-marker"><span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td> | ||
| {{if eq .GetType 4}} | ||
| <td class="chroma lines-code blob-hunk"><span class="mono wrap">{{$section.GetComputedInlineDiffFor $line}}</span></td> | ||
| {{else}} | ||
| <td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{if and $.root.SignedUserID $line.CanComment $.root.PageIsPullFiles}}<a class="ui green button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}" data-path="{{$file.Name}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}" data-type-marker="+"></a>{{end}}<span class="mono wrap">{{$section.GetComputedInlineDiffFor $line}}</span></td> | ||
| {{end}} | ||
| {{if eq $line.GetExpandDirection 2}} | ||
| <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> | ||
| {{svg "octicon-fold" 16}} | ||
| </a> | ||
| {{end}} | ||
| </td> | ||
| {{else}} | ||
| <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{Sha1 $file.Name}}L{{$line.LeftIdx}}{{end}}"></span></td> | ||
| <td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}"></span></td> | ||
| {{end}} | ||
| <td class="lines-type-marker"><span class="mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td> | ||
| {{if eq .GetType 4}} | ||
| <td class="chroma lines-code blob-hunk"><span class="mono wrap">{{$section.GetComputedInlineDiffFor $line}}</span></td> | ||
| {{else}} | ||
| <td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{if and $.root.SignedUserID $line.CanComment $.root.PageIsPullFiles}}<a class="ui green button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}" data-path="{{$file.Name}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}" data-type-marker="+"></a>{{end}}<span class="mono wrap">{{$section.GetComputedInlineDiffFor $line}}</span></td> | ||
| {{end}} | ||
| </tr> | ||
| {{if gt (len $line.Comments) 0}} | ||
| {{$resolved := (index $line.Comments 0).IsResolved}} | ||
| {{$resolveDoer := (index $line.Comments 0).ResolveDoer}} | ||
| {{$isNotPending := (not (eq (index $line.Comments 0).Review.Type 0))}} | ||
| <tr> | ||
| <td colspan="2" class="lines-num"></td> | ||
| <td class="add-comment-left add-comment-right" colspan="2"> | ||
| {{if $resolved}} | ||
| <div class = "ui attached header"> | ||
| <span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.root.i18n.Tr "repo.issues.review.resolved_by"}}</span> | ||
| <button id="show-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="ui compact right labeled button show-outdated"> | ||
| {{svg "octicon-unfold" 16}} | ||
| {{$.root.i18n.Tr "repo.issues.review.show_resolved"}} | ||
| </button> | ||
| <button id="hide-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="hide ui compact right labeled button hide-outdated"> | ||
| {{svg "octicon-fold" 16}} | ||
| {{$.root.i18n.Tr "repo.issues.review.hide_resolved"}} | ||
| </button> | ||
| </div> | ||
| {{end}} | ||
| <div id="code-comments-{{(index $line.Comments 0).ID}}" class="field comment-code-cloud {{if $resolved}}hide{{end}}"> | ||
| <div class="comment-list"> | ||
| <ui class="ui comments"> | ||
| {{ template "repo/diff/comments" dict "root" $.root "comments" $line.Comments}} | ||
| </ui> | ||
| </div> | ||
| {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $line.Comments 0).ReviewID "root" $.root "comment" (index $line.Comments 0)}} | ||
| {{if and $.root.CanMarkConversation $isNotPending}} | ||
| <button class="ui icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.root.RepoLink}}/issues/resolve_conversation" > | ||
| {{if $resolved}} | ||
| {{$.root.i18n.Tr "repo.issues.review.un_resolve_conversation"}} | ||
| {{else}} | ||
| {{$.root.i18n.Tr "repo.issues.review.resolve_conversation"}} | ||
| </tr> | ||
| {{if gt (len $line.Comments) 0}} | ||
| {{$resolved := (index $line.Comments 0).IsResolved}} | ||
| {{$resolveDoer := (index $line.Comments 0).ResolveDoer}} | ||
| {{$isNotPending := (not (eq (index $line.Comments 0).Review.Type 0))}} | ||
| <tr> | ||
| <td colspan="2" class="lines-num"></td> | ||
| <td class="add-comment-left add-comment-right" colspan="2"> | ||
| {{if $resolved}} | ||
| <div class = "ui attached header"> | ||
| <span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.root.i18n.Tr "repo.issues.review.resolved_by"}}</span> | ||
| <button id="show-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="ui compact right labeled button show-outdated"> | ||
| {{svg "octicon-unfold" 16}} | ||
| {{$.root.i18n.Tr "repo.issues.review.show_resolved"}} | ||
| </button> | ||
| <button id="hide-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="hide ui compact right labeled button hide-outdated"> | ||
| {{svg "octicon-fold" 16}} | ||
| {{$.root.i18n.Tr "repo.issues.review.hide_resolved"}} | ||
| </button> | ||
| </div> | ||
| {{end}} | ||
| <div id="code-comments-{{(index $line.Comments 0).ID}}" class="field comment-code-cloud {{if $resolved}}hide{{end}}"> | ||
| <div class="comment-list"> | ||
| <ui class="ui comments"> | ||
| {{ template "repo/diff/comments" dict "root" $.root "comments" $line.Comments}} | ||
| </ui> | ||
| </div> | ||
| {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $line.Comments 0).ReviewID "root" $.root "comment" (index $line.Comments 0)}} | ||
| {{if and $.root.CanMarkConversation $isNotPending}} | ||
| <button class="ui icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.root.RepoLink}}/issues/resolve_conversation" > | ||
| {{if $resolved}} | ||
| {{$.root.i18n.Tr "repo.issues.review.un_resolve_conversation"}} | ||
| {{else}} | ||
| {{$.root.i18n.Tr "repo.issues.review.resolve_conversation"}} | ||
| {{end}} | ||
| </button> | ||
| {{end}} | ||
| </button> | ||
| {{end}} | ||
| </div> | ||
| </td> | ||
| </tr> | ||
| </div> | ||
| </td> | ||
| </tr> | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} |