aboutsummaryrefslogtreecommitdiffstats
path: root/public/js
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2019-06-26 23:35:07 +0200
committerzeripath <art27@cantab.net>2019-06-26 22:35:07 +0100
commitda230412574daa9697b4cef24c7be6209b8884dc (patch)
tree24c1a7ba637c04fe9512643079572afe63d89d39 /public/js
parentedc94c70413048107ea728ff330f32ca3de6df88 (diff)
downloadgitea-da230412574daa9697b4cef24c7be6209b8884dc.tar.gz
gitea-da230412574daa9697b4cef24c7be6209b8884dc.zip
fix extra newlines when copying from diff in Firefox (#7288)
* 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
Diffstat (limited to 'public/js')
-rw-r--r--public/js/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/public/js/index.js b/public/js/index.js
index 3b2527d986..53fcaa8ba1 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1069,8 +1069,8 @@ function initPullRequestReview() {
var ntr = tr.next();
if (!ntr.hasClass('add-comment')) {
ntr = $('<tr class="add-comment">'
- + (isSplit ? '<td class="lines-num"></td><td class="add-comment-left"></td><td class="lines-num"></td><td class="add-comment-right"></td>'
- : '<td class="lines-num"></td><td class="lines-num"></td><td class="add-comment-left add-comment-right"></td>')
+ + (isSplit ? '<td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-right"></td>'
+ : '<td class="lines-num"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left add-comment-right"></td>')
+ '</tr>');
tr.after(ntr);
}