From 5e8ff8405d8624a2704626c7ef96ce5652aab399 Mon Sep 17 00:00:00 2001 From: Jonathan Sampson Date: Mon, 24 Apr 2017 14:58:00 -0500 Subject: [PATCH 1/2] Adds support to disable autoplay --- app/extensions/brave/locales/en-US/bravery.properties | 1 + js/about/preferences.js | 3 +++ js/components/braveryPanel.js | 3 +++ js/constants/appConfig.js | 4 ++++ js/state/contentSettings.js | 8 ++++++++ 5 files changed, 19 insertions(+) diff --git a/app/extensions/brave/locales/en-US/bravery.properties b/app/extensions/brave/locales/en-US/bravery.properties index dbccbe3592..da711ef83d 100644 --- a/app/extensions/brave/locales/en-US/bravery.properties +++ b/app/extensions/brave/locales/en-US/bravery.properties @@ -26,3 +26,4 @@ httpReroutes={[plural(httpsUpgradeCount)]} httpReroutes[one]=HTTPS Upgrade httpReroutes[other]=HTTPS Upgrades editBraveryGlobalSettings=Edit default shield settings… +allowAutoplay=Allow Autoplay Media diff --git a/js/about/preferences.js b/js/about/preferences.js index 5b2606fa10..a1f551eb68 100644 --- a/js/about/preferences.js +++ b/js/about/preferences.js @@ -49,6 +49,7 @@ const adInsertion = appConfig.resourceNames.AD_INSERTION const trackingProtection = appConfig.resourceNames.TRACKING_PROTECTION const httpsEverywhere = appConfig.resourceNames.HTTPS_EVERYWHERE const safeBrowsing = appConfig.resourceNames.SAFE_BROWSING +const autoplay = appConfig.resourceNames.AUTOPLAY const noScript = appConfig.resourceNames.NOSCRIPT const flash = appConfig.resourceNames.FLASH @@ -496,6 +497,7 @@ class ShieldsTab extends ImmutableComponent { this.onChangeAdControl = this.onChangeAdControl.bind(this) this.onToggleHTTPSE = this.onToggleSetting.bind(this, httpsEverywhere) this.onToggleSafeBrowsing = this.onToggleSetting.bind(this, safeBrowsing) + this.onToggleAutoplay = this.onToggleSetting.bind(this, autoplay) this.onToggleNoScript = this.onToggleSetting.bind(this, noScript) } onChangeAdControl (e) { @@ -546,6 +548,7 @@ class ShieldsTab extends ImmutableComponent { +