Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #10304 from brave/10303
Browse files Browse the repository at this point in the history
do not show up loading icon for about pages
  • Loading branch information
bsclifton authored Aug 7, 2017
2 parents fbb8fea + 2afb9a2 commit 54a174c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion app/renderer/components/tabs/content/favIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const tabState = require('../../../../common/state/tabState')

// Utils
const frameStateUtil = require('../../../../../js/state/frameStateUtil')
const {isSourceAboutUrl} = require('../../../../../js/lib/appUrlUtil')

// Styles
const globalStyles = require('../../styles/global')
Expand All @@ -38,8 +39,11 @@ class Favicon extends React.Component {
const tabId = frame.get('tabId', tabState.TAB_ID_NONE)

const props = {}

// used in renderer
props.isTabLoading = isTabLoading

// there's no need to show loading icon for about pages
props.isTabLoading = !isSourceAboutUrl(frame.get('location')) && isTabLoading
props.favicon = !isTabLoading && frame.get('icon')
props.isPinnedTab = tabState.isTabPinned(state, tabId)
props.tabIconColor = tabContentState.getTabIconColor(currentWindow, frameKey)
Expand Down

0 comments on commit 54a174c

Please sign in to comment.