From 69bc19f2dff383a2b194934238ee6953a0838a94 Mon Sep 17 00:00:00 2001 From: Austin Hanson Date: Wed, 4 Sep 2019 16:21:54 -0500 Subject: [PATCH 1/2] #77 - Handling an empty actTabs gracefully --- src/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils.js b/src/utils.js index f9aab5e30..cc38061b1 100644 --- a/src/utils.js +++ b/src/utils.js @@ -329,7 +329,7 @@ function findSuccessorTab(state, tab, exclude) { } // Previous tab - if (state.activateAfterClosing === 'prev') { + if (state.activateAfterClosing === 'prev' || (state.actTabs == null && state.activateAfterClosing === 'prev_act')) { for (let i = tab.index, prev; i--; ) { prev = state.tabs[i] @@ -381,7 +381,7 @@ function findSuccessorTab(state, tab, exclude) { } // Previously active tab - if (state.activateAfterClosing === 'prev_act') { + if (state.actTabs != null && state.activateAfterClosing === 'prev_act') { let targetId for (let i = state.actTabs.length; i--; ) { targetId = state.actTabs[i] From 542fac391e80ab64f834ead4d3616f5c9ec0f6fe Mon Sep 17 00:00:00 2001 From: Max Badryzlov Date: Thu, 5 Sep 2019 04:20:56 +0500 Subject: [PATCH 2/2] Fix PR --- src/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils.js b/src/utils.js index cc38061b1..26ddababf 100644 --- a/src/utils.js +++ b/src/utils.js @@ -329,7 +329,7 @@ function findSuccessorTab(state, tab, exclude) { } // Previous tab - if (state.activateAfterClosing === 'prev' || (state.actTabs == null && state.activateAfterClosing === 'prev_act')) { + if (state.activateAfterClosing === 'prev') { for (let i = tab.index, prev; i--; ) { prev = state.tabs[i] @@ -381,7 +381,7 @@ function findSuccessorTab(state, tab, exclude) { } // Previously active tab - if (state.actTabs != null && state.activateAfterClosing === 'prev_act') { + if (state.actTabs && state.activateAfterClosing === 'prev_act') { let targetId for (let i = state.actTabs.length; i--; ) { targetId = state.actTabs[i]