diff options
author | Phil Hughes <me@iamphill.com> | 2017-11-29 13:26:35 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-11-29 13:26:35 +0300 |
commit | 1880809d8ef9b650d1af615ebbaa590626ccf17f (patch) | |
tree | eef870533780f46d46a638446ceaa7e878122627 /app/assets | |
parent | d22bb0397b04f2870c6fbbeb2912ef6627e4afb7 (diff) |
added editor options to redcue EE conflicts
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/repo/lib/editor.js | 10 | ||||
-rw-r--r-- | app/assets/javascripts/repo/lib/editor_options.js | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/javascripts/repo/lib/editor.js b/app/assets/javascripts/repo/lib/editor.js index e82fbfc0e9c..db499444402 100644 --- a/app/assets/javascripts/repo/lib/editor.js +++ b/app/assets/javascripts/repo/lib/editor.js @@ -2,6 +2,7 @@ import DecorationsController from './decorations/controller'; import DirtyDiffController from './diff/controller'; import Disposable from './common/disposable'; import ModelManager from './common/model_manager'; +import editorOptions from './editor_options'; export default class Editor { static create(monaco) { @@ -49,6 +50,15 @@ export default class Editor { this.currentModel = model; + this.instance.updateOptions(editorOptions.reduce((acc, obj) => { + Object.keys(obj).forEach((key) => { + Object.assign(acc, { + [key]: obj[key](model), + }); + }); + return acc; + }, {})); + this.dirtyDiffController.reDecorate(model); } diff --git a/app/assets/javascripts/repo/lib/editor_options.js b/app/assets/javascripts/repo/lib/editor_options.js new file mode 100644 index 00000000000..701affc466e --- /dev/null +++ b/app/assets/javascripts/repo/lib/editor_options.js @@ -0,0 +1,2 @@ +export default [{ +}]; |