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

refactor monaco-editor import and stop storing as class property within model

This commit is contained in:
Mike Greiling 2018-06-08 00:12:51 -05:00
parent 4653820d37
commit e3c9db3f1f
No known key found for this signature in database
GPG Key ID: 0303DF507FA67596
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/ide/lib/common/model.js
View File

@ -1,33 +1,32 @@
import * as monaco from 'monaco-editor';
import { editor as monacoEditor, Uri as monacoUri } from 'monaco-editor';
import Disposable from './disposable';
import eventHub from '../../eventhub';
export default class Model {
constructor(file, head = null) {
this.monaco = monaco;
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(false, false, `original/${this.path}`),
new monacoUri(false, false, `original/${this.path}`),
)),
(this.model = this.monaco.editor.createModel(
(this.model = monacoEditor.createModel(
this.content,
undefined,
new this.monaco.Uri(false, false, this.path),
new monacoUri(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(false, false, `target/${this.path}`),
new monacoUri(false, false, `target/${this.path}`),
)),
);
}