diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-28 14:08:15 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-28 14:08:38 +0100 |
| commit | 6bec91bfc9ec15556e833f4d8f441328d135638e (patch) | |
| tree | c0df9de688ad06b334014d91ffd816110bf0ed4c | |
| parent | 029f7e6cd87ec0d59b85f12b57ee3c3a889dac1f (diff) | |
| download | gitlab-ce-6bec91bfc9ec15556e833f4d8f441328d135638e.tar.gz | |
fixed karma
| -rw-r--r-- | app/assets/javascripts/ide/stores/mutations/file.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/ide/stores/mutations/file_spec.js | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js index db3893b97d4..4fafcfd0ea1 100644 --- a/app/assets/javascripts/ide/stores/mutations/file.js +++ b/app/assets/javascripts/ide/stores/mutations/file.js @@ -8,7 +8,9 @@ export default { if (active && !state.entries[path].pending) { Object.assign(state, { - openFiles: state.openFiles.map(f => Object.assign(f, { active: !(f.pending && f.active) })), + openFiles: state.openFiles.map(f => + Object.assign(f, { active: f.pending ? false : f.active }), + ), }); } }, diff --git a/spec/javascripts/ide/stores/mutations/file_spec.js b/spec/javascripts/ide/stores/mutations/file_spec.js index 3f379ff219b..4f9e00b8543 100644 --- a/spec/javascripts/ide/stores/mutations/file_spec.js +++ b/spec/javascripts/ide/stores/mutations/file_spec.js @@ -27,6 +27,7 @@ describe('Multi-file store file mutations', () => { localState.openFiles.push({ ...localFile, pending: true, + active: true, }); mutations.SET_FILE_ACTIVE(localState, { |