diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-07 12:08:34 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-07 12:08:34 +0300 |
| commit | 4581a78d66a93c6d82b39d1214b75e15681a9960 (patch) | |
| tree | 4fecac73aba986ddcce6a82515bf7775d212f986 /app/assets/javascripts/ide/stores/mutations | |
| parent | 690c57867d6dcaaaee15208e9d4de6ec85f19e80 (diff) | |
| parent | 671e93dc38365f3b05cb3cfe719e64713196be31 (diff) | |
Merge branch 'master' into ide-staged-changes
Diffstat (limited to 'app/assets/javascripts/ide/stores/mutations')
| -rw-r--r-- | app/assets/javascripts/ide/stores/mutations/file.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js index 3ee352309d4..dee59e5751b 100644 --- a/app/assets/javascripts/ide/stores/mutations/file.js +++ b/app/assets/javascripts/ide/stores/mutations/file.js @@ -42,6 +42,8 @@ export default { renderError: data.render_error, raw: null, baseRaw: null, + html: data.html, + size: data.size, }); }, [types.SET_FILE_RAW_DATA](state, { file, raw }) { @@ -83,6 +85,11 @@ export default { mrChange, }); }, + [types.SET_FILE_VIEWMODE](state, { file, viewMode }) { + Object.assign(state.entries[file.path], { + viewMode, + }); + }, [types.DISCARD_FILE_CHANGES](state, path) { Object.assign(state.entries[path], { content: state.entries[path].raw, |