diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-04 13:40:38 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-04 13:40:38 +0000 |
commit | 9f2f8679bec1e2d4161c429c2e6db80a20e376c9 (patch) | |
tree | 3e6f89e5dc2cb6e33c281fbae32ebe4e52d1968d /app/assets/javascripts/ide/stores/actions/file.js | |
parent | 805302c0c09f0c6a3226efd2d3fca1b46015f9e0 (diff) | |
parent | 14b8ac3e2a1c29c7f86391118f6916959a1337c6 (diff) | |
download | gitlab-ce-9f2f8679bec1e2d4161c429c2e6db80a20e376c9.tar.gz |
Merge branch 'ide-sidebar-merge-request' into '44846-improve-web-ide-left-panel-and-modes'
Added merge request review to IDE sidebar
See merge request gitlab-org/gitlab-ce!18709
Diffstat (limited to 'app/assets/javascripts/ide/stores/actions/file.js')
-rw-r--r-- | app/assets/javascripts/ide/stores/actions/file.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 4fe6f5334e3..8076de1b7e3 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -5,6 +5,7 @@ import service from '../../services'; import * as types from '../mutation_types'; import router from '../../ide_router'; import { setPageTitle } from '../utils'; +import { viewerTypes } from '../../constants'; export const closeFile = ({ commit, state, dispatch }, file) => { const path = file.path; @@ -23,7 +24,7 @@ export const closeFile = ({ commit, state, dispatch }, file) => { const nextFileToOpen = state.openFiles[nextIndexToOpen]; if (nextFileToOpen.pending) { - dispatch('updateViewer', 'diff'); + dispatch('updateViewer', viewerTypes.diff); dispatch('openPendingTab', { file: nextFileToOpen, keyPrefix: nextFileToOpen.staged ? 'staged' : 'unstaged', @@ -194,7 +195,11 @@ export const unstageChange = ({ commit }, path) => { }; export const openPendingTab = ({ commit, getters, dispatch, state }, { file, keyPrefix }) => { - if (getters.activeFile && getters.activeFile.path === file.path && state.viewer === 'diff') { + if ( + getters.activeFile && + getters.activeFile.path === file.path && + state.viewer === viewerTypes.diff + ) { return false; } |