finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make copy/paste work for source code (#12191)

Browse source 
* Make copy/paste work for source code

Fix regression casued by #12047 so copy/paste works properly in all browsers.

Fixes #12184

Also while looking at this I saw a small display issue for blame view. I think #12023 was merged into original PR through an update branch before #12047 was merged and made one of the css ruules not apply anymore.

* use pseudo-element to prevent copying of comment + symbol even when not visually selected

* remove added newline here should not be necessary anymore

* make sure empty line is newline so there is something to select and copy
This commit is contained in:
mrsdizzie 2020-07-08 17:02:38 -04:00 • committed by GitHub
parent cedbd3684f
commit a6168fa25d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/highlight/highlight.go
View file

@ -44,6 +44,9 @@ func NewContext() {
func Code(fileName, code string) string {
NewContext()
if code == "" {
return "\n"
}
if len(code) > sizeLimit {
return code
}
@ -133,7 +136,12 @@ func File(numLines int, fileName string, code []byte) map[int]string {
m := make(map[int]string, numLines)
for k, v := range strings.SplitN(htmlbuf.String(), "\n", numLines) {
line := k + 1
m[line] = string(v)
content := string(v)
//need to keep lines that are only \n so copy/paste works properly in browser
if content == "" {
content = "\n"
}
m[line] = content
}
return m
}
@ -143,7 +151,12 @@ func plainText(code string, numLines int) map[int]string {
m := make(map[int]string, numLines)
for k, v := range strings.SplitN(string(code), "\n", numLines) {
line := k + 1
m[line] = string(v)
content := string(v)
//need to keep lines that are only \n so copy/paste works properly in browser
if content == "" {
content = "\n"
}
m[line] = content
}
return m
}