diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-12 12:17:18 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-12 12:17:18 +0200 |
| commit | 077ecf8a80733878fd35a407bdd623273598c3e2 (patch) | |
| tree | b405cf1639c57b21dbf5cf020a5f81f0cfab62ca | |
| parent | ea6a2b0a84b25379df2b13adf3ba52da975db0b5 (diff) | |
| download | gitlab-ce-ide-update-monaco.tar.gz | |
Fixes the Problem with the Repo Editor Loading Typescript Serviceside-update-monaco
| -rw-r--r-- | app/assets/javascripts/repo/components/repo_editor.vue | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue index 96d6a75bb61..b316c3ae02d 100644 --- a/app/assets/javascripts/repo/components/repo_editor.vue +++ b/app/assets/javascripts/repo/components/repo_editor.vue @@ -22,7 +22,8 @@ const RepoEditor = { const monacoInstance = Helper.monaco.editor.create(this.$el, { model: null, readOnly: false, - contextmenu: false, + contextmenu: true, + scrollBeyondLastLine: false, }); Helper.monacoInstance = monacoInstance; diff --git a/config/webpack.config.js b/config/webpack.config.js index c515a170d2d..89cab19bec5 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -232,7 +232,7 @@ var config = { from: path.join(ROOT_PATH, `node_modules/monaco-editor/${IS_PRODUCTION ? 'min' : 'dev'}/vs`), to: 'monaco-editor/vs', transform: function(content, path) { - if (/\.js$/.test(path) && !/worker/i.test(path)) { + if (/\.js$/.test(path) && !/worker/i.test(path) && !/typescript/i.test(path)) { return ( '(function(){\n' + 'var define = this.define, require = this.require;\n' + |