From dc94b0f0c6ea97c09344d1a34da70f8e2d1d708f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 Jan 2017 14:35:32 +0100
Subject: [PATCH] [merge addon] Anchor copy button to editable side for
insertions
Since showing it next to an empty chunk looks bad
Issue #4492
---
addon/merge/merge.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 352e27dc..b3a9af40 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -431,10 +431,10 @@
var editOriginals = dv.mv.options.allowEditingOriginals;
copy.title = editOriginals ? "Push to left" : "Revert chunk";
copy.chunk = chunk;
- copy.style.top = top + "px";
+ copy.style.top = (chunk.origTo < chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
if (editOriginals) {
- var topReverse = dv.orig.heightAtLine(chunk.editFrom, "local") - sTopEdit;
+ var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
"CodeMirror-merge-copy-reverse"));
copyReverse.title = "Push to right";
--
GitLab