Merge pull request #12351 from brave/fix/12345

Add falsey checks for frames and closed frames
brave · Dec 22, 2017 · e6fc6b0 · e6fc6b0
1 parent 8379ff3
commit e6fc6b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -435,6 +435,8 @@ function tabTemplateInit (frameProps) {
   const template = [CommonMenu.newTabMenuItem(frameProps.get('tabId'))]
   const location = frameProps.get('location')
   const store = windowStore.getState()
+  const frames = store.get('frames')
+  const closedFrames = store.get('closedFrames')
 
   if (location !== 'about:newtab') {
     template.push(
@@ -454,7 +456,7 @@ function tabTemplateInit (frameProps) {
       })
   }
 
-  if (windowStore.getState().get('frames').size > 1 &&
+  if (frames && frames.size > 1 &&
       !frameProps.get('pinnedLocation')) {
     template.push({
       label: locale.translation('detach'),
@@ -486,7 +488,6 @@ function tabTemplateInit (frameProps) {
   //   }
   // })
 
-  const frames = windowStore.getState().get('frames')
   const frameToSkip = frameProps.get('key')
   const frameList = frames.map((frame) => {
     return {
@@ -551,7 +552,7 @@ function tabTemplateInit (frameProps) {
 
   template.push(Object.assign({},
     CommonMenu.reopenLastClosedTabItem(),
-    { enabled: store.get('closedFrames').size > 0 }
+    { enabled: closedFrames ? closedFrames.size > 0 : false }
   ))
 
   return menuUtil.sanitizeTemplateItems(template)

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -324,7 +324,7 @@ const doAction = (action) => {
     case windowConstants.WINDOW_UNDO_CLOSED_FRAME:
       {
         const closedFrames = windowState.get('closedFrames')
-        if (closedFrames.size === 0) {
+        if (!closedFrames || closedFrames.size === 0) {
           break
         }
         const frame = closedFrames.last()