lxm_front/Mergely
1
0
Fork 1
mirror of synced 2025-12-10 08:24:14 +08:00
Code Issues Projects Releases Wiki Activity

fixes initial change issue

Browse Source
This commit is contained in:
Jamie Peabody
2020-11-23 20:06:09 +00:00
parent e38cd50037
commit 3830cff687
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@@ -1,5 +1,8 @@
# Changes
## 4.2.2:
* patch: fixes issue where initial change was not being set causing next/prev and merge actions to not work as expected.
## 4.2.1:
* chore: updated dependencies, cleared security issues

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "mergely",
"version": "4.2.1",
"version": "4.2.2",
"description": "A javascript UI for diff/merge",
"directories": {
"doc": "doc",

13
src/mergely.js
View File

@@ -505,7 +505,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
scrollToDiff: function(direction) {
if (!this.changes.length) return;
if (direction == 'next') {
if (this._current_diff == this.changes.length -1) {
if (this._current_diff == this.changes.length - 1) {
this._current_diff = 0;
} else {
this._current_diff = Math.min(++this._current_diff, this.changes.length - 1);
@@ -893,6 +893,11 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
this._skipscroll[editor_name] = false;
return;
}
if (!this.changes) {
// pasting a wide line can trigger scroll before changes
// are calculated
return;
}
var scroller = jQuery(this.editor[editor_name].getScrollerElement());
if (this.midway == undefined) {
this.midway = (scroller.height() / 2.0 + scroller.offset().top).toFixed(2);
@@ -1045,11 +1050,13 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
this.trace('change', 'diff time', Timer.stop());
this.changes = Mgly.DiffParser(d.normal_form());
this.trace('change', 'parse time', Timer.stop());
if (this._current_diff === undefined && this.changes.length && this._initializing) {
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._scroll_to_change(this.changes[0]);
if (this._initializing) {
this._scroll_to_change(this.changes[0]);
}
}
this.trace('change', 'scroll_to_change time', Timer.stop());
this._calculate_offsets(editor_name1, editor_name2, this.changes);