summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/repo
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-11-01 13:03:19 +0000
committerPhil Hughes <me@iamphill.com>2017-11-01 13:03:19 +0000
commit984f3b7dffc24636604e406b2240e2ae2e1b5f84 (patch)
tree134df56cab4feca7676b57b52cdb4ddc7b9fecd8 /app/assets/javascripts/repo
parente457f3fbffddb84357e9449c66c2af675fbb526b (diff)
downloadgitlab-ce-984f3b7dffc24636604e406b2240e2ae2e1b5f84.tar.gz
Fix binary files not showing anything in edit modemulti-file-editor-binary-editor
Diffstat (limited to 'app/assets/javascripts/repo')
-rw-r--r--app/assets/javascripts/repo/components/repo_editor.vue8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue
index 0d6729bb99b..1c864b176b1 100644
--- a/app/assets/javascripts/repo/components/repo_editor.vue
+++ b/app/assets/javascripts/repo/components/repo_editor.vue
@@ -27,6 +27,8 @@ export default {
'changeFileContent',
]),
initMonaco() {
+ if (this.shouldHideEditor) return;
+
if (this.monacoInstance) {
this.monacoInstance.setModel(null);
}
@@ -94,8 +96,12 @@ export default {
<template>
<div
id="ide"
- v-if='!shouldHideEditor'
class="blob-viewer-container blob-editor-container"
>
+ <div
+ v-if="shouldHideEditor"
+ v-html="activeFile.html"
+ >
+ </div>
</div>
</template>