Merge pull request #14102 from brave/fix/14101-tab-page-change-new-tab

When no frame index is provided for a new tab, insert at the end of the frame list
brave · May 12, 2018 · ff065bb · ff065bb
2 parents 73886ff + 11854e6
commit ff065bb
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -118,11 +118,10 @@ const newFrame = (state, frameOpts) => {
     console.debug('newFrame', frameOpts)
   }
   // Ensure valid index
-  let insertionIndex = frameOpts.index != null
-    ? frameOpts.index
-    : 0
+  let insertionIndex = frameOpts.index
   const highestFrameIndex = (state.get('frames') || Immutable.List()).count()
-  if (insertionIndex === -1 || insertionIndex > highestFrameIndex) {
+  const insertionIndexIsInvalid = (insertionIndex == null || insertionIndex < 0 || insertionIndex > highestFrameIndex)
+  if (insertionIndexIsInvalid) {
     if (shouldLogDebug) {
       console.debug(`newFrame: invalid insertionIndex of ${insertionIndex} so using max index of ${highestFrameIndex}`)
     }