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

Adding return after rejects in a few places. Implementing Ghostery side of GH-885. Fix for GH-871. #10

Merged
merged 10 commits into from Mar 23, 2018
+64 −41
Merged

Adding return after rejects in a few places. Implementing Ghostery side of GH-885. Fix for GH-871. #10

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
54b5286
Adding return after rejects in a few places.
Mar 20, 2018
6078357
Implementing flag for site-specific unblocks.
Mar 22, 2018
c81bd41
Using abbreviations for seconds, removing unnecessary comment.
Mar 22, 2018
0745205
Requested changes.
Mar 23, 2018
61a1e5c
Implementing suggested changes.
Mar 23, 2018
40c1d48
Update policy block reason name.
jsignanini Mar 23, 2018
6bf01a9
Update block reason names. Call allowedOnce check only when needed.
jsignanini Mar 23, 2018
6ee32ae
Update JSDocs and add missing block reason.
jsignanini Mar 23, 2018
b523b46
Update JSDocs and update block reason c2p names.
jsignanini Mar 23, 2018
73cc0eb
Fix typo.
jsignanini Mar 23, 2018
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…
Update policy block reason name.
  • Loading branch information
@jsignanini
jsignanini committed Mar 23, 2018
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
commit 40c1d482ee6ea023ca0783e86c1d274f3ca036b7
4 src/classes/EventHandlers.js
View file
Open in desktop
@@ -23,7 +23,7 @@ import conf from './Conf';
import foundBugs from './FoundBugs';
import globals from './Globals';
import latency from './Latency';
import Policy, { BLOCK_REASON_SS_UNBLOCK } from './Policy';
import Policy, { BLOCK_REASON_SS_UNBLOCKED } from './Policy';
import PolicySmartBlock from './PolicySmartBlock';
import PurpleBox from './PurpleBox';
import surrogatedb from './SurrogateDb';
@@ -378,7 +378,7 @@ class EventHandlers {
const tab_host = tabInfo.getTabInfo(tab_id, 'host');
const fromRedirect = globals.REDIRECT_MAP.has(request_id);
const { block, reason } = this._checkBlocking(app_id, cat_id, tab_id, tab_host, page_url, request_id);
if (!block && reason === BLOCK_REASON_SS_UNBLOCK) {
if (!block && reason === BLOCK_REASON_SS_UNBLOCKED) {
// The way to pass this flag to Cliqz handlers
details.ghosteryWhitelisted = true;
}
ProTip! Use n and p to navigate between commits in a pull request.