Skip to content

/ ghostery-extension

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

Jump to bottom

Feature/gh 1239 #131

Merged
merged 5 commits into from Jul 12, 2018
+209 −71
Merged

Feature/gh 1239 #131

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2972082
GH-1256 update tracker count to respect AdBlock and AntiTrack counts
IAmThePan Jul 10, 2018
337cb56
GH-1256 Update. Reduce ambiguity for total trackers
IAmThePan Jul 10, 2018
f697bb2
Blocked Count in Category respects Smart Block active status
IAmThePan Jul 11, 2018
1ff6df2
GH-1246 GH-1239 Tracker count incorperates the Anti-Suite. Trackers B…
IAmThePan Jul 12, 2018
400cc26
Fix linting errors
IAmThePan Jul 12, 2018
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Loading status checks…
Fix linting errors
  • Loading branch information
@IAmThePan
IAmThePan committed Jul 12, 2018
commit 400cc2624854b2e003dddaf20ff8ad6827a72224
2 app/panel/utils/blocking.js
View file
Open in desktop
@@ -77,7 +77,7 @@ export function updateBlockAllTrackers(state, action) {
const blocked = !action.data.allBlocked;
const updated_app_ids = JSON.parse(JSON.stringify(state.selected_app_ids)) || {};
const updated_categories = JSON.parse(JSON.stringify(state.categories)) || [];
const smartBlockActive = action.data.smartBlockActive;
const { smartBlockActive } = action.data;
const smartBlock = smartBlockActive && action.data.smartBlock || { blocked: {}, unblocked: {} };

updated_categories.forEach((category) => {
ProTip! Use n and p to navigate between commits in a pull request.