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

Added ignorecase to editor

Browse Source
This commit is contained in:
Jamie Peabody
2017-02-28 22:32:46 +00:00
parent d761609e54
commit da41c28fdb
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mergely.js
View File

@@ -395,7 +395,6 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
viewport: false,
ignorews: false,
ignorecase: false,
wrapdiff: false,
fadein: 'fast',
editor_width: '650px',
editor_height: '400px',
@@ -499,14 +498,14 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
scrollToDiff: function(direction) {
if (!this.changes.length) return;
if (direction == 'next') {
if (this.settings.wrapdiff && 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);
}
}
else if (direction == 'prev') {
if (this.settings.wrapdiff && this._current_diff == 0) {
if (this._current_diff == 0) {
this._current_diff = this.changes.length - 1;
} else {
this._current_diff = Math.max(--this._current_diff, 0);