lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-04-05 10:28:35 +08:00
Code Issues Projects Releases Wiki Activity

chore: fixed scroll to first change

Browse Source
This commit is contained in:
Jamie Peabody
2022-01-02 12:00:13 +00:00
parent 2fa28df778
commit fab6c08286
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/diff-view.js
View File

@@ -182,8 +182,7 @@ CodeMirrorDiffView.prototype.scrollToDiff = function(direction) {
} else {
this._current_diff = Math.min(++this._current_diff, this.changes.length - 1);
}
}
else if (direction === 'prev') {
} else if (direction === 'prev') {
if (this._current_diff == 0) {
this._current_diff = this.changes.length - 1;
} else {
@@ -191,7 +190,6 @@ CodeMirrorDiffView.prototype.scrollToDiff = function(direction) {
}
}
this._scroll_to_change(this.changes[this._current_diff]);
this._changing();
};
CodeMirrorDiffView.prototype.mergeCurrentChange = function(side) {
@@ -488,7 +486,6 @@ CodeMirrorDiffView.prototype.bind = function(el) {
// get current diff border color from user-defined css
const diffColor
= htmlToElement('<div style="display:none" class="mergely current start"></div>')
// const body = this._queryElement('body');
this.el.append(diffColor);
this.current_diff_color = window.getComputedStyle(diffColor).borderTopColor;
@@ -631,7 +628,7 @@ CodeMirrorDiffView.prototype._scroll_to_change = function(change) {
led.setCursor(llf, 0);
red.setCursor(rlf, 0);
if (change['lhs-line-to'] >= 0) {
led.scrollIntoView({ line: change['lhs-line-to'] });
this.scrollTo('lhs', change['lhs-line-to'])
}
led.focus();
};
@@ -836,7 +833,7 @@ CodeMirrorDiffView.prototype._renderChanges = function() {
if (this._current_diff === undefined && this.changes.length) {
// go to first difference on start-up where values are provided in
// settings.
this._current_diff = 0;
this._current_diff = -1;
}
this._markup_changes(this.changes);
this.trace('change', 'markup time', Timer.stop());
@@ -1245,7 +1242,6 @@ CodeMirrorDiffView.prototype._merge_change = function(change, side, oside) {
}
odoc.replaceRange(text, CodeMirror.Pos(ofrom, ofromlen));
}
this._scroll_to_change(change);
};
CodeMirrorDiffView.prototype._draw_info = function() {