liuxm/Mergely
1
0
Fork 0
forked from lxm_front/Mergely
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for merge-button and optimize

Browse Source
This commit is contained in:
Jamie Peabody
2016-05-25 22:22:04 +01:00
parent c3093d7b8f
commit 4bbc6c597f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mergely.js
View File

@@ -306,8 +306,8 @@ jQuery.extend(Mgly.diff.prototype, {
end++;
}
if ((end < ctx.codes.length) && (ctx.codes[start] == ctx.codes[end])) {
ctx.codes.modified[start] = false;
ctx.codes.modified[end] = true;
ctx.modified[start] = false;
ctx.modified[end] = true;
}
else {
start = end;
@@ -732,7 +732,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
function gutterClicked(side, line, ev) {
// The "Merge left/right" buttons are also located in the gutter.
// Don't interfere with them:
if(ev.target && (ev.target.parentNode.className.indexOf('merge-button') >= 0)) {
if (ev.target && (jQuery(ev.target).closest('.merge-button').length > 0)) {
return;
}
@@ -1137,7 +1137,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
return changes;
},
_markup_changes: function (editor_name1, editor_name2, changes) {
jQuery('.merge-button').remove(); // clear
this.element.find('.merge-button').remove(); //clear
var self = this;
var led = this.editor[editor_name1];