MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 23:42:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add a new menu in file view to open blame view and fix blame view select range bug (#19500)

Browse source
This commit is contained in:
Lunny Xiao 2022-04-26 18:54:40 +08:00 committed by GitHub
parent fef26c159c
commit 03eba32bd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
options/locale/locale_en-US.ini
View file

@ -1041,6 +1041,7 @@ line_unicode = `This line has hidden unicode characters`
escape_control_characters = Escape escape_control_characters = Escape
unescape_control_characters = Unescape unescape_control_characters = Unescape
file_copy_permalink = Copy Permalink file_copy_permalink = Copy Permalink
view_git_blame = View Git Blame
video_not_supported_in_browser = Your browser does not support the HTML5 'video' tag. video_not_supported_in_browser = Your browser does not support the HTML5 'video' tag.
audio_not_supported_in_browser = Your browser does not support the HTML5 'audio' tag. audio_not_supported_in_browser = Your browser does not support the HTML5 'audio' tag.
stored_lfs = Stored with Git LFS stored_lfs = Stored with Git LFS
@ -3088,7 +3089,7 @@ settings.link = Link this package to a repository
settings.link.description = If you link a package with a repository, the package is listed in the repository's package list. settings.link.description = If you link a package with a repository, the package is listed in the repository's package list.
settings.link.select = Select Repository settings.link.select = Select Repository
settings.link.button = Update Repository Link settings.link.button = Update Repository Link
settings.link.success = Repository link was successfully updated. settings.link.success = Repository link was successfully updated.
settings.link.error = Failed to update repository link. settings.link.error = Failed to update repository link.
settings.delete = Delete package settings.delete = Delete package
settings.delete.description = Deleting a package is permanent and cannot be undone. settings.delete.description = Deleting a package is permanent and cannot be undone.

3
templates/repo/view_file.tmpl
View file

@ -128,6 +128,9 @@
<a class="item ref-in-new-issue" href="{{.RepoLink}}/issues/new?body={{.Repository.HTMLURL}}{{printf "/src/commit/" }}{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}" rel="nofollow noindex">{{.i18n.Tr "repo.issues.context.reference_issue"}}</a> <a class="item ref-in-new-issue" href="{{.RepoLink}}/issues/new?body={{.Repository.HTMLURL}}{{printf "/src/commit/" }}{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}" rel="nofollow noindex">{{.i18n.Tr "repo.issues.context.reference_issue"}}</a>
</div> </div>
{{end}} {{end}}
<div class="ui link list">
<a class="item view_git_blame" href="{{.Repository.HTMLURL}}/blame/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}">{{.i18n.Tr "repo.view_git_blame"}}</a>
</div>
<div class="ui link list"> <div class="ui link list">
<a data-clipboard-text="{{.Repository.HTMLURL}}/src/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}" class="item copy-line-permalink">{{.i18n.Tr "repo.file_copy_permalink"}}</a> <a data-clipboard-text="{{.Repository.HTMLURL}}/src/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}" class="item copy-line-permalink">{{.i18n.Tr "repo.file_copy_permalink"}}</a>
</div> </div>

22
web_src/js/features/repo-code.js
View file

@ -15,10 +15,7 @@ function selectRange($list, $select, $from) {
// add hashchange to permalink // add hashchange to permalink
const $issue = $('a.ref-in-new-issue'); const $issue = $('a.ref-in-new-issue');
const $copyPermalink = $('a.copy-line-permalink'); const $copyPermalink = $('a.copy-line-permalink');
const $viewGitBlame = $('a.view_git_blame');
if ($copyPermalink.length === 0) {
return;
}
const updateIssueHref = function (anchor) { const updateIssueHref = function (anchor) {
if ($issue.length === 0) { if ($issue.length === 0) {
@ -29,7 +26,22 @@ function selectRange($list, $select, $from) {
$issue.attr('href', href); $issue.attr('href', href);
}; };
const updateViewGitBlameFragment = function (anchor) {
if ($viewGitBlame.length === 0) {
return;
}
let href = $viewGitBlame.attr('href');
href = `${href.replace(/#L\d+$|#L\d+-L\d+$/, '')}`;
if (anchor.length !== 0) {
href = `${href}#${anchor}`;
}
$viewGitBlame.attr('href', href);
};
const updateCopyPermalinkHref = function(anchor) { const updateCopyPermalinkHref = function(anchor) {
if ($copyPermalink.length === 0) {
return;
}
let link = $copyPermalink.attr('data-clipboard-text'); let link = $copyPermalink.attr('data-clipboard-text');
link = `${link.replace(/#L\d+$|#L\d+-L\d+$/, '')}#${anchor}`; link = `${link.replace(/#L\d+$|#L\d+-L\d+$/, '')}#${anchor}`;
$copyPermalink.attr('data-clipboard-text', link); $copyPermalink.attr('data-clipboard-text', link);
@ -53,6 +65,7 @@ function selectRange($list, $select, $from) {
changeHash(`#L${a}-L${b}`); changeHash(`#L${a}-L${b}`);
updateIssueHref(`L${a}-L${b}`); updateIssueHref(`L${a}-L${b}`);
updateViewGitBlameFragment(`L${a}-L${b}`);
updateCopyPermalinkHref(`L${a}-L${b}`); updateCopyPermalinkHref(`L${a}-L${b}`);
return; return;
} }
@ -61,6 +74,7 @@ function selectRange($list, $select, $from) {
changeHash(`#${$select.attr('rel')}`); changeHash(`#${$select.attr('rel')}`);
updateIssueHref($select.attr('rel')); updateIssueHref($select.attr('rel'));
updateViewGitBlameFragment($select.attr('rel'));
updateCopyPermalinkHref($select.attr('rel')); updateCopyPermalinkHref($select.attr('rel'));
} }