fix extra newlines when copying from diff in Firefox #7288

silverwind · 2019-06-24T22:16:07Z

Followup on #7279 to fix copy from diff in Firefox.

First, the <pre><code> seems to add a forced newline that is not possible to get rid of via CSS, so I replaced it with just a <code>. Secondly, .lines-type-marker also forced a newline in the copied text, but that was possible to get rid of via user-select: none.

This should fix it for Firefox and Chrome. Safari still has a extraneous newline in the copied text of unknown origin, but this should not block stop this PR.

Also see https://bugzilla.mozilla.org/show_bug.cgi?id=1273836

See https://bugzilla.mozilla.org/show_bug.cgi?id=1273836 Basically, the <pre><code> seems to add a forced newline that is not possible to get rid of via CSS, so I replaced it with just a <code>. Secondly, .lines-type-marker also forced a newline in the copied text, but that was possible to get rid of via user-select. Safari still has a extraneous newline in the copied text of unknown origin, but this should not block stop this PR.

codecov-io · 2019-06-24T22:47:10Z

Codecov Report

Merging #7288 into master will decrease coverage by <.01%.
The diff coverage is 84.61%.

@@            Coverage Diff             @@
##           master    #7288      +/-   ##
==========================================
- Coverage   41.24%   41.24%   -0.01%     
==========================================
  Files         464      464              
  Lines       62841    62846       +5     
==========================================
+ Hits        25917    25918       +1     
- Misses      33533    33537       +4     
  Partials     3391     3391

Impacted Files	Coverage Δ
models/git_diff.go	`68.34% <84.61%> (+0.29%)`	⬆️
modules/log/event.go	`64.61% <0%> (-1.03%)`	⬇️
models/repo_list.go	`72.08% <0%> (-1.02%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update edc94c7...3c17bb4. Read the comment docs.

mrsdizzie · 2019-06-24T23:12:02Z

Hmm this PR makes the diff look different and not alligned in Safari/Firefox/Chrome for me:

Before:

After:

silverwind · 2019-06-25T05:46:44Z

Fixed that by removing the <pre> in the types marker. I had removed the rule that removes that inherent <pre> margin, forgetting that the types marker still needed it. I don't see a reason for it to be <pre> (there is no whitespace in it), so simplified it to just a <code>.

This removes the extra newlines that Safari copies as well. Safari still has a issue with weird indendation being copied, thought.

templates/repo/diff/box.tmpl

zeripath · 2019-06-25T06:07:04Z

I had assumed that the pre was there for a reason that's why I left it in.

silverwind · 2019-06-25T06:45:49Z

<pre> is only needed if you want to preserve whitespace, and even then, you can get the same effect via white-space: pre (GitHub actually does that). We already have a similiar white-space: pre-wrap on the <code>, so it's sufficient.

silverwind · 2019-06-25T06:50:53Z

Noticed an issue with content being absent in the split diff, will fix that later and also investigate Safari.

templates/repo/diff/box.tmpl

zeripath · 2019-06-25T21:43:22Z

Damn it's not copying the data-line-num either.

zeripath · 2019-06-25T21:52:40Z

OK fixed that too. I'll stop hammering your PR now.

silverwind · 2019-06-25T22:05:13Z

Wow, good find. Would never have imagined we would have sneaky JS embedded in template code. Very bad practice imho.

I will give this PR another run of tests tomorrow, pretty sure a few fixups will be needed, so please don't merge yet, unless this fix is deemed critical (for a release).

mrsdizzie · 2019-06-25T22:08:29Z

Won't approve yet based on last comment, but my initial padding/alignment issue seems fixed and all of the fixes for the split view seem OK and that appears to be working as it was before. Also agree a real "wtf" for this template.

zeripath · 2019-06-25T22:10:36Z

Yeah that's probably why I missed it. That the comment box template is also stored in index.is is also unexpected too.

It should not be this fiddly to adjust the diff format! Diff was already on my naughty list, but it might just have risen a bit higher.

Once again I'm so sorry for messing this up. I really did not expect it to be so fragile!

templates/repo/diff/box.tmpl

Co-Authored-By: zeripath <art27@cantab.net>

silverwind · 2019-06-26T17:39:50Z

Fixed that Safari copy/paste issue. Turns out it was tripping on the whitespace between HTML tags which I've now removed. It makes the template a bit uglier to read but it unfortunately is neccesary. Does not look like go template has any built-in way to auto-strip whitespace around tags.

So this PR should be ready for review. It contains a important fix for the split diff among the copy/paste fixes for Firefox and Safari.

mrsdizzie · 2019-06-26T18:03:04Z

It seems to not copy any newlines now, even intentional ones:

So a diff like this:

+ echo test
+
+ echo test
+
+ echo test

Would get copied as

echo test
echo test
echo test

silverwind · 2019-06-26T18:12:55Z

You're right. It seems we need to render a <br> like GitHub on empty lines for that to work.

silverwind · 2019-06-26T18:22:02Z

@mrsdizzie should be fixed as of last commit.

templates/repo/diff/box.tmpl

zeripath · 2019-06-26T20:15:13Z

~~Damn I think https://try.gitea.io/silverwind/symlink-test/commit/f2f2a03c79d7b2ab89785fca78c2f85d123b7d78?style=split is broke again.~~

I'm being a muppet!

zeripath · 2019-06-26T20:49:59Z

@silverwind thank you so much for fixing my idiotic broken PR. I'm so sorry once again for so many problems. I can't understand how I missed how broken it was.

mrsdizzie

Looks good thanks again @silverwind for going beyond the initial scope of this to help fix everything!

zeripath · 2019-06-26T20:52:17Z

@silverwind are you happy with my last change. I think we will be able to merge if so.

silverwind · 2019-06-26T20:56:17Z

I'm happy if @mrsdizzie is happy 🤣

In hindsight, it would've probably been easier if you had opened a separate PR for those fixes, thought on the other hand, it was kind of convenient to have the fixes in the branch 😉

* fix extra newlines when copying from diff See https://bugzilla.mozilla.org/show_bug.cgi?id=1273836 Basically, the <pre><code> seems to add a forced newline that is not possible to get rid of via CSS, so I replaced it with just a <code>. Secondly, .lines-type-marker also forced a newline in the copied text, but that was possible to get rid of via user-select. Safari still has a extraneous newline in the copied text of unknown origin, but this should not block stop this PR. * simplify .line-type-marker * fix selector * remove erronous ^^^ * Fix empty split diff * Fix arc-theme-green * fix add comment * ensure line-num is copied too * Update templates/repo/diff/box.tmpl Co-Authored-By: zeripath <art27@cantab.net> * attempt to fix safari via removing <code> * remove useless whitespace at the end of 'class' * remove inter-tag whitespace for code <td>s * more inter-tag removal * final inter-tag removal * attempt to fix empty line copy * move and comment getLineContent * fix golint * make background grey for missing added code

silverwind mentioned this pull request Jun 24, 2019

Make diff line-marker non-selectable #7279

Merged

silverwind changed the title ~~fix extra newlines when copying from diff~~ fix extra newlines when copying from diff in Firefox Jun 24, 2019

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 24, 2019

silverwind added 2 commits June 25, 2019 07:30

simplify .line-type-marker

f665fb8

fix selector

c3e1b4b

zeripath reviewed Jun 25, 2019

View reviewed changes

templates/repo/diff/box.tmpl Outdated Show resolved Hide resolved

remove erronous ^^^

1055a8d

zeripath reviewed Jun 25, 2019

View reviewed changes

templates/repo/diff/box.tmpl Outdated Show resolved Hide resolved

zeripath added 2 commits June 25, 2019 22:27

Fix empty split diff

80eff24

Fix arc-theme-green

297849b

zeripath approved these changes Jun 25, 2019

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 25, 2019

fix add comment

e35d576

ensure line-num is copied too

ab2369e

zeripath reviewed Jun 25, 2019

View reviewed changes

templates/repo/diff/box.tmpl Outdated Show resolved Hide resolved

silverwind and others added 2 commits June 26, 2019 18:56

Update templates/repo/diff/box.tmpl

3ca20ec

Co-Authored-By: zeripath <art27@cantab.net>

attempt to fix safari via removing <code>

6641ba4

silverwind added 4 commits June 26, 2019 19:21

remove useless whitespace at the end of 'class'

6a8e66d

remove inter-tag whitespace for code <td>s

a5e4053

more inter-tag removal

c589a93

final inter-tag removal

3975edc

attempt to fix empty line copy

e4fb045

move and comment getLineContent

b91c8e9

mrsdizzie reviewed Jun 26, 2019

View reviewed changes

templates/repo/diff/box.tmpl Show resolved Hide resolved

fix golint

391395f

zeripath added 2 commits June 26, 2019 21:42

make background grey for missing added code

12cc33f

Merge branch 'master' into copy-diff

3c17bb4

zeripath added this to the 1.9.0 milestone Jun 26, 2019

zeripath added type/bug topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile labels Jun 26, 2019

mrsdizzie approved these changes Jun 26, 2019

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 26, 2019

zeripath merged commit da23041 into go-gitea:master Jun 26, 2019

zeripath mentioned this pull request Jun 27, 2019

Code review comment UI broken #7310

Closed

silverwind mentioned this pull request Jul 12, 2019

Diff: Fix indentation on unhighlighted code #7435

Merged

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix extra newlines when copying from diff in Firefox #7288

fix extra newlines when copying from diff in Firefox #7288

silverwind commented Jun 24, 2019 •

edited

codecov-io commented Jun 24, 2019 •

edited

mrsdizzie commented Jun 24, 2019

silverwind commented Jun 25, 2019

zeripath commented Jun 25, 2019

silverwind commented Jun 25, 2019 •

edited

silverwind commented Jun 25, 2019

zeripath commented Jun 25, 2019

zeripath commented Jun 25, 2019

silverwind commented Jun 25, 2019 •

edited

mrsdizzie commented Jun 25, 2019

zeripath commented Jun 25, 2019

silverwind commented Jun 26, 2019 •

edited

mrsdizzie commented Jun 26, 2019

silverwind commented Jun 26, 2019

silverwind commented Jun 26, 2019

zeripath commented Jun 26, 2019 •

edited

zeripath commented Jun 26, 2019

mrsdizzie left a comment

zeripath commented Jun 26, 2019

silverwind commented Jun 26, 2019 •

edited

fix extra newlines when copying from diff in Firefox #7288

fix extra newlines when copying from diff in Firefox #7288

Conversation

silverwind commented Jun 24, 2019 • edited

codecov-io commented Jun 24, 2019 • edited

Codecov Report

mrsdizzie commented Jun 24, 2019

silverwind commented Jun 25, 2019

zeripath commented Jun 25, 2019

silverwind commented Jun 25, 2019 • edited

silverwind commented Jun 25, 2019

zeripath commented Jun 25, 2019

zeripath commented Jun 25, 2019

silverwind commented Jun 25, 2019 • edited

mrsdizzie commented Jun 25, 2019

zeripath commented Jun 25, 2019

silverwind commented Jun 26, 2019 • edited

mrsdizzie commented Jun 26, 2019

silverwind commented Jun 26, 2019

silverwind commented Jun 26, 2019

zeripath commented Jun 26, 2019 • edited

zeripath commented Jun 26, 2019

mrsdizzie left a comment

Choose a reason for hiding this comment

zeripath commented Jun 26, 2019

silverwind commented Jun 26, 2019 • edited

silverwind commented Jun 24, 2019 •

edited

codecov-io commented Jun 24, 2019 •

edited

silverwind commented Jun 25, 2019 •

edited

silverwind commented Jun 25, 2019 •

edited

silverwind commented Jun 26, 2019 •

edited

zeripath commented Jun 26, 2019 •

edited

silverwind commented Jun 26, 2019 •

edited