diff options
| author | DJ Mountney <david@twkie.net> | 2018-04-04 12:49:08 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2018-04-04 12:49:08 -0700 |
| commit | 39bb3720381af64039673cf21705fcf95cf78314 (patch) | |
| tree | c32aa05ee2eaa2e0b93ec811a6ad8f3aa71a207e /app/assets/javascripts/ide/ide_router.js | |
| parent | f7f92836400ec86c74d1140223c009d3d328aea9 (diff) | |
| parent | 166b4575a6353668c894fea0ba234d0b371dee03 (diff) | |
| download | gitlab-ce-39bb3720381af64039673cf21705fcf95cf78314.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'app/assets/javascripts/ide/ide_router.js')
| -rw-r--r-- | app/assets/javascripts/ide/ide_router.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js index be2c12c0487..20983666b4a 100644 --- a/app/assets/javascripts/ide/ide_router.js +++ b/app/assets/javascripts/ide/ide_router.js @@ -77,7 +77,11 @@ router.beforeEach((to, from, next) => { if (to.params[0]) { const path = to.params[0].slice(-1) === '/' ? to.params[0].slice(0, -1) : to.params[0]; - const treeEntry = store.state.entries[path]; + const treeEntryKey = Object.keys(store.state.entries).find( + key => key === path && !store.state.entries[key].pending, + ); + const treeEntry = store.state.entries[treeEntryKey]; + if (treeEntry) { store.dispatch('handleTreeEntryAction', treeEntry); } |