safari/contentBlocking.js - Issue 29829615: Issue 6786 - Switch Safari 12+ users to content blocking API

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: safari/contentBlocking.js

Issue 29829615: Issue 6786 - Switch Safari 12+ users to content blocking API (Closed)

Patch Set: Prevent Safari 12+ users switch content blocking mode off Created July 13, 2018, 6:23 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: safari/contentBlocking.js

diff --git a/safari/contentBlocking.js b/safari/contentBlocking.js

index 3f9f7ea4cc4f346f1371632a809f939c3ffb4c7e..c68b251d22b9a65850fb38f58bd2f3e5798ac8e7 100644

--- a/safari/contentBlocking.js

+++ b/safari/contentBlocking.js

@@ -183,7 +183,7 @@ if (contentBlockingSupported)

legacyAPISupported]).then(resolvedValues =>

{

let legacyAPISupported = resolvedValues[2];

- if (!legacyAPISupported)

+ if (!legacyAPISupported || Services.vc.compare(require("info").applicationVersion, "12") >= 0)

Prefs.safariContentBlocker = true;

if (Prefs.safariContentBlocker)

« no previous file with comments | « options.js ('k') | safari/ext/content.js » ('j') | safari/ext/content.js » ('J')