From 379678a14c5837bca01c94ce7806eb8743897bff Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Wed, 17 May 2017 00:09:09 +0200 Subject: [PATCH] Fixes lion badge when disabled Resolves #8889 Auditors: @bsclifton Test Plan: - Visit any site - Disable shields - Lion head is grayed out --- app/renderer/components/navigation/navigator.js | 3 ++- js/components/braveryPanel.js | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/renderer/components/navigation/navigator.js b/app/renderer/components/navigation/navigator.js index c198ba4d4ef..d2ded530700 100644 --- a/app/renderer/components/navigation/navigator.js +++ b/app/renderer/components/navigation/navigator.js @@ -153,7 +153,8 @@ class Navigator extends React.Component { const activeTab = tabState.getByTabId(state, activeTabId) const activeTabShowingMessageBox = !!(activeTab && tabState.isShowingMessageBox(state, activeTabId)) const allSiteSettings = siteSettingsState.getAllSiteSettings(state, activeFrame) - const braverySettings = siteSettings.activeSettings(allSiteSettings, state, appConfig) + const activeSiteSettings = siteSettings.getSiteSettingsForURL(allSiteSettings, activeFrame.get('location')) + const braverySettings = siteSettings.activeSettings(activeSiteSettings, state, appConfig) const enabledExtensions = extensionState.getEnabledExtensions(state) const extensionBrowserActions = enabledExtensions .map((extension) => { diff --git a/js/components/braveryPanel.js b/js/components/braveryPanel.js index a25dd1187cb..e481c8e8719 100644 --- a/js/components/braveryPanel.js +++ b/js/components/braveryPanel.js @@ -150,7 +150,6 @@ class BraveryPanel extends ImmutableComponent { if (setting !== 'noScript' && (parsedUrl.protocol === 'https:' || parsedUrl.protocol === 'http:')) { ruleKey = `https?://${parsedUrl.host}` } - console.log(e.target.value) appActions.changeSiteSetting(ruleKey, setting, e.target.value, this.isPrivate) this.onReload() }