Merge pull request #3205 from darkdh/3189

Use noScript state per site instead of blocking scripts
brave · Aug 16, 2016 · cf76ac5 · cf76ac5
2 parents 0304281 + fb9709c
commit cf76ac5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/js/components/main.js b/js/components/main.js
@@ -764,7 +764,6 @@ class Main extends ImmutableComponent {
             enableNoScript={this.enableNoScript(activeSiteSettings)}
             settings={this.props.appState.get('settings')}
             noScriptIsVisible={noScriptIsVisible}
-            blockedScripts={activeFrame && activeFrame.getIn(['noScript', 'blocked'])}
           />
           {
             siteInfoIsVisible

diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
@@ -178,7 +178,7 @@ class NavigationBar extends ImmutableComponent {
         endLoadTime={this.props.endLoadTime}
         titleMode={this.titleMode}
         urlbar={this.props.navbar.get('urlbar')}
-        isBlockingScripts={this.props.blockedScripts && this.props.blockedScripts.size > 0}
+        enableNoScript={this.props.enableNoScript}
         />
       {
         isSourceAboutUrl(this.props.location)

diff --git a/js/components/urlBar.js b/js/components/urlBar.js
@@ -130,9 +130,10 @@ class UrlBar extends ImmutableComponent {
               location = location.replace(replaceRE, '')
               searchUrl = this.searchSelectEntry.search.replace('{searchTerms}', encodeURIComponent(location))
             }
+
             if ((defaultEngine === 'DuckDuckGo' ||
               (this.searchSelectEntry && this.searchSelectEntry.name === 'DuckDuckGo')) &&
-            this.props.isBlockingScripts) {
+            this.props.enableNoScript) {
               searchUrl = searchUrl.replace('?q=', 'html?q=')
             }
             location = isLocationUrl ? location : searchUrl
@@ -462,7 +463,7 @@ class UrlBar extends ImmutableComponent {
             urlPreview={this.props.urlbar.get('urlPreview')}
             searchSelectEntry={this.searchSelectEntry}
             previewActiveIndex={this.props.previewActiveIndex || 0}
-            isBlockingScripts={this.props.isBlockingScripts} />
+            enableNoScript={this.props.enableNoScript} />
           : null
         }
     </form>

diff --git a/js/components/urlBarSuggestions.js b/js/components/urlBarSuggestions.js
@@ -332,7 +332,7 @@ class UrlBarSuggestions extends ImmutableComponent {
           let searchURL = this.props.searchSelectEntry
           ? this.props.searchSelectEntry.search : this.props.searchDetail.get('searchURL')
           if (getSetting(settings.DEFAULT_SEARCH_ENGINE) === 'DuckDuckGo' &&
-            this.props.isBlockingScripts) {
+            this.props.enableNoScript) {
             searchURL = searchURL.replace('?q=', 'html?q=')
           }
           return searchURL.replace('{searchTerms}', encodeURIComponent(searchTerms))