diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-08 09:53:54 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-08 09:53:54 +0300 |
commit | 9d285f1fef0ca66da16b7c0ba42f50071dab73ab (patch) | |
tree | 53e2f68c4c6e7f64f35f706ae57caa4dead3c15c /app/assets/javascripts/ide/lib/common/model.js | |
parent | 5652b3aad99e73d5ea33f5f310d6bee85654634c (diff) | |
parent | eeafa8ac354a74e945d1fc7c9a5cfa039898a9af (diff) |
Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into 'master'
Resolve "Upgrade Monaco editor and remove CopyWebpackPlugin"
Closes #44331
See merge request gitlab-org/gitlab-ce!17813
Diffstat (limited to 'app/assets/javascripts/ide/lib/common/model.js')
-rw-r--r-- | app/assets/javascripts/ide/lib/common/model.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js index e5149b1f3ad..78e6f632728 100644 --- a/app/assets/javascripts/ide/lib/common/model.js +++ b/app/assets/javascripts/ide/lib/common/model.js @@ -1,32 +1,32 @@ +import { editor as monacoEditor, Uri } from 'monaco-editor'; import Disposable from './disposable'; import eventHub from '../../eventhub'; export default class Model { - constructor(monaco, file, head = null) { - this.monaco = monaco; + constructor(file, head = null) { this.disposable = new Disposable(); this.file = file; this.head = head; this.content = file.content !== '' ? file.content : file.raw; this.disposable.add( - (this.originalModel = this.monaco.editor.createModel( + (this.originalModel = monacoEditor.createModel( head ? head.content : this.file.raw, undefined, - new this.monaco.Uri(null, null, `original/${this.path}`), + new Uri(false, false, `original/${this.path}`), )), - (this.model = this.monaco.editor.createModel( + (this.model = monacoEditor.createModel( this.content, undefined, - new this.monaco.Uri(null, null, this.path), + new Uri(false, false, this.path), )), ); if (this.file.mrChange) { this.disposable.add( - (this.baseModel = this.monaco.editor.createModel( + (this.baseModel = monacoEditor.createModel( this.file.baseRaw, undefined, - new this.monaco.Uri(null, null, `target/${this.path}`), + new Uri(false, false, `target/${this.path}`), )), ); } |