Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-06-06 11:25:13 +0300
committerMike Greiling <mike@pixelcog.com>2018-06-08 00:35:34 +0300
commit6d96b9dd6be8d27d3030e7a6de08ec3ba419643e (patch)
tree0bd8b7d742677734ca563cfa02658d40fdc17f3b /app/assets/javascripts
parent41aa6bd8776570b491747b95c146255c0b58a870 (diff)
add monaco-editor-webpack-plugin and update webpack config
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/ide/components/repo_editor.vue10
1 files changed, 3 insertions, 7 deletions
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index 93453989c08..5af0f142d5e 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -1,10 +1,9 @@
<script>
-/* global monaco */
import { mapState, mapGetters, mapActions } from 'vuex';
+import * as monaco from 'monaco-editor';
import flash from '~/flash';
import ContentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue';
import { activityBarViews, viewerTypes } from '../constants';
-import monacoLoader from '../monaco_loader';
import Editor from '../lib/editor';
import ExternalLink from './external_link.vue';
@@ -87,11 +86,8 @@ export default {
if (this.editor && monaco) {
this.initMonaco();
} else {
- monacoLoader(['vs/editor/editor.main'], () => {
- this.editor = Editor.create(monaco);
-
- this.initMonaco();
- });
+ this.editor = Editor.create(monaco);
+ this.initMonaco();
}
},
methods: {