Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-2178: Update Anti-suite names where they appear in GBE #614

Closed
wants to merge 16 commits into from
Closed
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev

Update Smart Blocking -> Smart Blocking in comments

  • Loading branch information
benstrumeyer committed Oct 27, 2020
commit 0166d29c75dcf4e3c430e07965dd80a38b9f1d04
@@ -19,7 +19,7 @@ import { sendMessage } from './msg';
* Dispatch action to SummaryActions to update trackerCounts.
* @memberOf PanelUtils
* @param {array} categories array of categories
* @param {object} smartBrowse blocked and unblocked of Smart Blocking
* @param {object} smartBrowse blocked and unblocked of Smart-Browsing
* @param {function} updateTrackerCounts from SummaryActions
*/
export function updateSummaryBlockingCount(categories = [], smartBrowse, updateTrackerCounts) {
@@ -726,7 +726,7 @@ class PanelData {
* @private
* @param {Object} tracker
* @param {Object} trackerState
* @param {Object} smartBrowse smart blocking stats for the active tab
* @param {Object} smartBrowse smart-browsing stats for the active tab
* @return {Object} object of tracker data
*/
static _buildTracker(tracker, trackerState, smartBrowse) {
@@ -1,7 +1,7 @@
/**
* Smart Blocking Policy Class
* Smart-Browsing Policy Class
*
* Handles policy for Smart Blocking
* Handles policy for Smart-Browsing
*
* Ghostery Browser Extension
* https://www.ghostery.com/
@@ -21,7 +21,7 @@ import Policy from './Policy';
import c2pDb from './Click2PlayDb';
import { log } from '../utils/common';
/**
* Class for handling Smart Blocking site policy.
* Class for handling Smart-Browsing site policy.
* @memberOf BackgroundClasses
* @todo make it a Singelton
*/
@@ -65,7 +65,7 @@ class PolicySmartBrowse {
}

if (reason) {
log('Smart Blocking unblocked appId', appId, 'for reason:', reason);
log('Smart-Browsing unblocked appId', appId, 'for reason:', reason);
tabInfo.setTabSmartBrowseAppInfo(tabId, appId, reason, false);
return true;
}
@@ -105,16 +105,16 @@ class PolicySmartBrowse {

const result = (reason === 'slow');
if (result) {
log('Smart Blocking blocked appId', appId, 'for reason:', reason);
log('Smart-Browsing blocked appId', appId, 'for reason:', reason);
tabInfo.setTabSmartBrowseAppInfo(tabId, appId, 'slow', true);
}

return result;
}

/**
* Check if Smart Block should proceed based on:
* 1. Smart Block is enabled
* Check if Smart-Browse should proceed based on:
* 1. Smart-Browse is enabled
* 2. Paused blocking is disabled
* 3. Page is neither whitelisted or blacklisted
* 4. Tracker is not site-specific unblocked
@@ -15,7 +15,7 @@
* prefetched: {boolean} indicates that the tab was prefetched and not part of the main window
* purplebox: {boolean} indicates that the purplebox.js script has been loaded on this tab
* protocol: {string} request protocol
* smartBrowse: {Object} smart blocking stats for this tab
* smartBrowse: {Object} smart-browsing stats for this tab
* url: {string} full url
* }
*
@@ -128,10 +128,10 @@ class TabInfo {
}

/**
* Set Smart Blocking counts for this tab
* Set Smart-Browsing counts for this tab
* @param {number} tabId tab id
* @param {number} appId tracker id
* @param {string} rule smart blocking rule name
* @param {string} rule smart-browsing rule name
* @param {boolean} blocked kind of policy to set
*/
setTabSmartBrowseAppInfo(tabId, appId, rule, blocked) {
ProTip! Use n and p to navigate between commits in a pull request.