lxm_front/Mergely
1
0
Fork 1
mirror of synced 2025-12-07 22:28:50 +08:00
Code Issues Projects Releases Wiki Activity

Fix bug during refactor (#127)

Browse Source
This commit is contained in:
Yiqiu Huang
2019-12-21 04:05:16 -06:00
committed by Jamie Peabody
parent 66c4ed650f
commit 73c1604981
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mergely.js
View File

@@ -456,8 +456,8 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
if (this.rhs_cmsettings.lineNumbers) {
rhs_gutters = ['merge', 'CodeMirror-linenumbers']
}
jQuery.extend(true, this.lhs_cmsettings, this.settings.cmsettings, { gutters: lhs_gutters }, this.settings);
jQuery.extend(true, this.rhs_cmsettings, this.settings.cmsettings, { gutters: rhs_gutters }, this.settings);
jQuery.extend(true, this.lhs_cmsettings, this.settings.cmsettings, { gutters: lhs_gutters }, this.settings.lhs_cmsettings);
jQuery.extend(true, this.rhs_cmsettings, this.settings.cmsettings, { gutters: rhs_gutters }, this.settings.rhs_cmsettings);
// bind if the element is destroyed
this.element.bind('destroyed', jQuery.proxy(this.teardown, this));