Merge pull request #8828 from brave/fix/flash-always-deny

fix flash always-deny setting
brave · May 18, 2017 · 8c73ba3 · 8c73ba3
2 parents 065b51a + 6528ab9
commit 8c73ba3
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/browser/reducers/flashReducer.js b/app/browser/reducers/flashReducer.js
@@ -6,6 +6,7 @@
 
 const appConstants = require('../../../js/constants/appConstants')
 const flash = require('../../../js/flash')
+const siteSettings = require('../../../js/state/siteSettings')
 const {makeImmutable} = require('../../common/state/immutableUtil')
 
 const flashReducer = (state, action, immutableAction) => {
@@ -15,8 +16,14 @@ const flashReducer = (state, action, immutableAction) => {
       flash.init()
       break
     case appConstants.APP_FLASH_PERMISSION_REQUESTED:
-      flash.showFlashMessageBox(action.get('location'), action.get('senderTabId'))
-      break
+      {
+        const location = action.get('location')
+        const settings = siteSettings.getSiteSettingsForURL(state.get('siteSettings'), location)
+        if (!(settings && ['boolean', 'number'].includes(typeof settings.get('flash')))) {
+          flash.showFlashMessageBox(location, action.get('senderTabId'))
+        }
+        break
+      }
   }
   return state
 }