kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

set `renderSideBySide` when creating diff instance

This commit is contained in:
Phil Hughes 2018-04-05 10:24:18 +01:00
parent bc64e20cab
commit 891164f10b
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/ide/lib/editor.js
View File

@ -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;
}
}

1
spec/javascripts/ide/lib/editor_spec.js
View File

@ -77,6 +77,7 @@ describe('Multi-file editor library', () => {
renderLineHighlight: 'none',
hideCursorInOverviewRuler: true,
wordWrap: 'on',
renderSideBySide: true,
});
});
});