Skip to content

Commit dc94b0f

Browse files
committed
[merge addon] Anchor copy button to editable side for insertions
Since showing it next to an empty chunk looks bad Issue codemirror#4492
1 parent 0fb17df commit dc94b0f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

addon/merge/merge.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,10 @@
431431
var editOriginals = dv.mv.options.allowEditingOriginals;
432432
copy.title = editOriginals ? "Push to left" : "Revert chunk";
433433
copy.chunk = chunk;
434-
copy.style.top = top + "px";
434+
copy.style.top = (chunk.origTo < chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
435435

436436
if (editOriginals) {
437-
var topReverse = dv.orig.heightAtLine(chunk.editFrom, "local") - sTopEdit;
437+
var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
438438
var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
439439
"CodeMirror-merge-copy-reverse"));
440440
copyReverse.title = "Push to right";

0 commit comments

Comments
 (0)