Context menu sometimes errors and won't show up

Fix #7017 Auditors: @bsclifton
brave · Feb 3, 2017 · bfc0cd1 · bfc0cd1 · bsclifton · Feb 3, 2017
1 parent cfa3186
commit bfc0cd1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/common/lib/menuUtil.js b/app/common/lib/menuUtil.js
@@ -161,21 +161,15 @@ const isItemValid = (currentItem, previousItem) => {
  * - entries which don't have a label or type
  */
 module.exports.sanitizeTemplateItems = (template) => {
-  const reduced = template.reduce((previousValue, currentValue, currentIndex, array) => {
-    const result = currentIndex === 1 ? [] : previousValue
-    if (currentIndex === 1) {
-      if (isItemValid(previousValue)) {
-        result.push(previousValue)
-      }
-    }
+  const reduced = template.reduce((result, currentValue, currentIndex, array) => {
     const previousItem = result.length > 0
       ? result[result.length - 1]
       : undefined
     if (isItemValid(currentValue, previousItem)) {
       result.push(currentValue)
     }
     return result
-  })
+  }, [])
 
   const result = Array.isArray(reduced)
     ? reduced

diff --git a/test/unit/app/common/lib/menuUtilTest.js b/test/unit/app/common/lib/menuUtilTest.js
@@ -285,5 +285,11 @@ describe('menuUtil tests', function () {
       const expectedResult = []
       assert.deepEqual(result, expectedResult)
     })
+    it('supports empty arrays', function () {
+      const template = []
+      const result = menuUtil.sanitizeTemplateItems(template)
+      const expectedResult = []
+      assert.deepEqual(result, expectedResult)
+    })
   })
 })