Merge pull request #10071 from NejcZdovc/hotfix/follow-#9899

Fixes some regression that was introduced with #9899
brave · Jul 20, 2017 · 7de868a · 7de868a
2 parents ffb0326 + d36ff7d
commit 7de868a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app/renderer/components/navigation/menuBarItem.js b/app/renderer/components/navigation/menuBarItem.js
@@ -58,7 +58,7 @@ class MenuBarItem extends React.Component {
     props.label = template.get('label')
 
     // used in other functions
-    props.submenu = template.get('submenu') && template.get('submenu').toJS()
+    props.submenu = template.get('submenu') && template.get('submenu').toJS() // TODO (nejc) only primitives
     props.lastFocusedSelector = currentWindow.getIn(['ui', 'menubar', 'lastFocusedSelector'])
     props.selectedIndex = selectedIndex
 

diff --git a/app/renderer/components/navigation/navigationBar.js b/app/renderer/components/navigation/navigationBar.js
@@ -100,7 +100,7 @@ class NavigationBar extends React.Component {
     const titleMode = activeTabShowingMessageBox ||
       (
         mouseInTitlebar === false &&
-        !bookmarkDetail &&
+        bookmarkDetail.isEmpty() &&
         hasTitle &&
         !['about:blank', 'about:newtab'].includes(location) &&
         !loading &&
@@ -116,7 +116,7 @@ class NavigationBar extends React.Component {
     props.isBookmarked = activeFrameKey !== undefined &&
       activeTab && activeTab.get('bookmarked')
     props.isWideUrlBarEnabled = getSetting(settings.WIDE_URL_BAR)
-    props.showBookmarkHanger = bookmarkDetail.get('isBookmarkHanger')
+    props.showBookmarkHanger = bookmarkDetail.get('isBookmarkHanger', false)
     props.isLoading = loading
     props.showPublisherToggle = publisherState.shouldShowAddPublisherButton(state, location, publisherId)
     props.showHomeButton = !props.titleMode && getSetting(settings.SHOW_HOME_BUTTON)

diff --git a/app/renderer/components/navigation/navigator.js b/app/renderer/components/navigation/navigator.js
@@ -158,7 +158,7 @@ class Navigator extends React.Component {
     const activeFrameKey = activeFrame.get('key')
     const activeTabId = activeFrame.get('tabId', tabState.TAB_ID_NONE)
     const activeTab = tabState.getByTabId(state, activeTabId) || Immutable.Map()
-    const activeTabShowingMessageBox = !!(activeTab && tabState.isShowingMessageBox(state, activeTabId))
+    const activeTabShowingMessageBox = !!(!activeTab.isEmpty() && tabState.isShowingMessageBox(state, activeTabId))
     const allSiteSettings = siteSettingsState.getAllSiteSettings(state, activeFrame)
     const activeSiteSettings = siteSettings.getSiteSettingsForURL(allSiteSettings, activeFrame.get('location'))
     const braverySettings = siteSettings.activeSettings(activeSiteSettings, state, appConfig)

diff --git a/app/renderer/components/tabs/tabPage.js b/app/renderer/components/tabs/tabPage.js
@@ -107,7 +107,7 @@ class TabPage extends React.Component {
 
     // used in other functions
     props.sourceDragFromPageIndex = sourceDragFromPageIndex
-    props.isPageEmpty = tabPageFrames.size === 0
+    props.isPageEmpty = tabPageFrames.isEmpty()
     props.moveToFrameKey = tabPageFrames.getIn([0, 'key'])
 
     return props

diff --git a/app/renderer/components/tabs/tabsToolbar.js b/app/renderer/components/tabs/tabsToolbar.js
@@ -46,7 +46,7 @@ class TabsToolbar extends React.Component {
 
     const props = {}
     // used in renderer
-    props.hasPinnedTabs = pinnedTabs.size > 0
+    props.hasPinnedTabs = !pinnedTabs.isEmpty()
 
     // used in other functions
     props.activeFrameKey = activeFrame.get('key')