diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js index 4f5106d1583..0fa0ddecf13 100644 --- a/app/assets/javascripts/ide/lib/editor.js +++ b/app/assets/javascripts/ide/lib/editor.js @@ -69,6 +69,7 @@ export default class Editor { occurrencesHighlight: false, renderLineHighlight: 'none', hideCursorInOverviewRuler: true, + renderSideBySide: this.renderSideBySide(domElement), })), ); @@ -177,11 +178,15 @@ export default class Editor { if (!this.isDiffEditorType) return; this.instance.updateOptions({ - renderSideBySide: this.instance.getDomNode().offsetWidth >= 700, + renderSideBySide: this.renderSideBySide(this.instance.getDomNode()), }); } get isDiffEditorType() { return this.instance.getEditorType() === 'vs.editor.IDiffEditor'; } + + renderSideBySide(domElement) { + return domElement.offsetWidth >= 700; + } } diff --git a/spec/javascripts/ide/lib/editor_spec.js b/spec/javascripts/ide/lib/editor_spec.js index ce3997761b9..75e6f0f54ec 100644 --- a/spec/javascripts/ide/lib/editor_spec.js +++ b/spec/javascripts/ide/lib/editor_spec.js @@ -77,6 +77,7 @@ describe('Multi-file editor library', () => { renderLineHighlight: 'none', hideCursorInOverviewRuler: true, wordWrap: 'on', + renderSideBySide: true, }); }); });