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.

Sign up for GitHub

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

Jump to bottom

Show zero lines on the line counter if the file empty #8700

Merged
merged 8 commits into from
Oct 29, 2019
Merged

Show zero lines on the line counter if the file empty #8700

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c6483fd
Show zero lines on the line counter if the file empty
lukbukkit Oct 26, 2019
c0bf6cb
A single variable to check whether NumLines is set
lukbukkit Oct 27, 2019
7479374
Merge branch 'master' into empty-file-zero-lines
lunny Oct 28, 2019
a6c4bb6
Merge branch 'master' into empty-file-zero-lines
lunny Oct 28, 2019
3f98be6
Merge branch 'master' into empty-file-zero-lines
lunny Oct 28, 2019
309dde8
Merge branch 'master' into empty-file-zero-lines
lunny Oct 29, 2019
691fbad
Merge branch 'master' into empty-file-zero-lines
techknowlogick Oct 29, 2019
3ff4f49
Merge branch 'master' into empty-file-zero-lines
techknowlogick Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions routers/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,11 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
var output bytes.Buffer
lines := strings.Split(fileContent, "\n")
ctx.Data["NumLines"] = len(lines)
if len(lines) == 1 && lines[0] == "" {
// If the file is completely empty, we show zero lines at the line counter
ctx.Data["NumLines"] = 0
}
ctx.Data["NumLinesSet"] = true

//Remove blank line at the end of file
if len(lines) > 0 && lines[len(lines)-1] == "" {
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/view_file.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<strong>{{.FileName}}</strong>
{{else}}
<div class="file-info text grey normal mono">
{{if .NumLines}}
{{if .NumLinesSet}}
<div class="file-info-entry">
{{.NumLines}} {{.i18n.Tr (TrN .i18n.Lang .NumLines "repo.line" "repo.lines") }}
</div>
Expand Down