summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/stores/utils.js
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-04-06 10:42:19 +0200
committerJames Lopez <james@jameslopez.es>2018-04-06 10:42:19 +0200
commita63c76faa09b5c4b7d10a9beebd46a117b10648a (patch)
tree1fe39ff16a07660ca5f214c5f08e028f6a798060 /app/assets/javascripts/ide/stores/utils.js
parent8ce1526652ec1feb818ef9a5558826987645fa19 (diff)
parent2faf991f31aceb1c34a3855695d25fab19203e36 (diff)
downloadgitlab-ce-10-7-stable-prepare-rc2.tar.gz
Merge remote-tracking branch 'origin/master' into 10-7-stable-prepare-rc210-7-stable-prepare-rc2
Diffstat (limited to 'app/assets/javascripts/ide/stores/utils.js')
-rw-r--r--app/assets/javascripts/ide/stores/utils.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/stores/utils.js b/app/assets/javascripts/ide/stores/utils.js
index 63e4de3b17d..4befcc501ef 100644
--- a/app/assets/javascripts/ide/stores/utils.js
+++ b/app/assets/javascripts/ide/stores/utils.js
@@ -38,6 +38,8 @@ export const dataStructure = () => ({
editorColumn: 1,
fileLanguage: '',
eol: '',
+ viewMode: 'edit',
+ previewMode: null,
});
export const decorateData = entity => {
@@ -57,8 +59,9 @@ export const decorateData = entity => {
changed = false,
parentTreeUrl = '',
base64 = false,
-
+ previewMode,
file_lock,
+ html,
} = entity;
return {
@@ -79,8 +82,9 @@ export const decorateData = entity => {
renderError,
content,
base64,
-
+ previewMode,
file_lock,
+ html,
};
};