diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-25 19:37:07 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-28 12:17:02 +0200 |
| commit | fa3b02413b356d47fa75bab193e4d323e6db416a (patch) | |
| tree | 8798a211526bffc983d40c6cc4a345189161b74a /app/assets/javascripts/ide/lib | |
| parent | b452bdead4f217b7488f13db9b608a9ddce1830e (diff) | |
| download | gitlab-ce-fa3b02413b356d47fa75bab193e4d323e6db416a.tar.gz | |
Fixed new Additions
Automatic Diff Navigation
Diffstat (limited to 'app/assets/javascripts/ide/lib')
| -rw-r--r-- | app/assets/javascripts/ide/lib/common/model.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/ide/lib/editor.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js index 1f69d2211e4..0dd4e009b1d 100644 --- a/app/assets/javascripts/ide/lib/common/model.js +++ b/app/assets/javascripts/ide/lib/common/model.js @@ -22,7 +22,7 @@ export default class Model { )), ); - if (this.file.baseRaw) { + if (this.file.mrChange) { this.disposable.add( (this.baseModel = this.monaco.editor.createModel( this.file.baseRaw, diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js index cb36300d25c..fd0c5bafaef 100644 --- a/app/assets/javascripts/ide/lib/editor.js +++ b/app/assets/javascripts/ide/lib/editor.js @@ -114,6 +114,10 @@ export default class Editor { original: model.getBaseModel(), modified: model.getModel(), }); + + this.monaco.editor.createDiffNavigator(this.instance, { + alwaysRevealFirst: true, + }); } setupMonacoTheme() { |