From 2afb9a2ada7d5d5e70d7506da50772a69f72e5d6 Mon Sep 17 00:00:00 2001 From: Cezar Augusto Date: Fri, 4 Aug 2017 16:40:18 -0500 Subject: [PATCH] do not show up loading icon for about pages Auditors: @bsclifton fix #10303 --- app/renderer/components/tabs/content/favIcon.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/renderer/components/tabs/content/favIcon.js b/app/renderer/components/tabs/content/favIcon.js index 181300b4fb7..1e87f33ae44 100644 --- a/app/renderer/components/tabs/content/favIcon.js +++ b/app/renderer/components/tabs/content/favIcon.js @@ -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') @@ -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)