lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-02-02 09:38:00 +08:00
Code Issues Projects Releases Wiki Activity

Fixes merge and gutter-click

Browse Source
This commit is contained in:
Jamie Peabody
2016-05-24 23:09:26 +01:00
parent d8f91e740d
commit 5445d5a703
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mergely.js
View File

@@ -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.className === 'merge-button')) {
if(ev.target && (ev.target.parentNode.className.indexOf('merge-button') >= 0)) {
return;
}
@@ -1320,7 +1320,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
// merge buttons
var ed = {lhs:led, rhs:red};
jQuery('.merge-button').on('click', function(ev){
this.element.find('.merge-button').on('click', function(ev){
// side of mouseenter
var side = 'rhs';
var oside = 'lhs';