From 0cd70a833fb8705ab5dfda87c1f0a225c4e3a38d Mon Sep 17 00:00:00 2001 From: Jamie Peabody Date: Thu, 6 Jun 2013 18:11:29 +0100 Subject: [PATCH] Added 'rhs_margin' option that accepts 'left' or 'right' to indicate the side to render the margin. Defaults to 'right'. --- lib/mergely.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/mergely.js b/lib/mergely.js index 26305c8..21abb45 100644 --- a/lib/mergely.js +++ b/lib/mergely.js @@ -351,6 +351,7 @@ jQuery.extend(Mgly.mergely.prototype, { this.settings = { autoupdate: true, autoresize: true, + rhs_margin: 'right', lcs: true, sidebar: true, ignorews: false, @@ -605,8 +606,14 @@ jQuery.extend(Mgly.mergely.prototype, { jQuery(this.element).append(jQuery('
')); jQuery(this.element).append(jQuery('
')); jQuery(this.element).append(jQuery('
')); + var rmargin = jQuery('
'); + if (this.settings.rhs_margin == 'left') { + jQuery(this.element).append(rmargin); + } jQuery(this.element).append(jQuery('
')); - jQuery(this.element).append(jQuery('
')); + if (this.settings.rhs_margin != 'left') { + jQuery(this.element).append(rmargin); + } //codemirror var cmstyle = '#' + this.id + ' .CodeMirror-gutter-text { padding: 5px 0 0 0; }' + '#' + this.id + ' .CodeMirror-lines pre, ' + '#' + this.id + ' .CodeMirror-gutter-text pre { line-height: 18px; }' +