Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions DuckDuckGo/ContentBlocker/ContentBlockerRulesLists.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ final class ContentBlockerRulesLists: DefaultContentBlockerRulesListsSource {
// Add new ones
let etag = MD5(data: Self.fbTrackerDataFile)
let dataSet: TrackerDataManager.DataSet = TrackerDataManager.DataSet(Self.fbTrackerDataSet, etag)
let additionalRulesList = ContentBlockerRulesList(name: Constants.clickToLoadRulesListName,
trackerData: nil,
fallbackTrackerData: dataSet)
if #available(OSX 11, *) { // disable CTL for Catalina and earlier
let CTLRulesList = ContentBlockerRulesList(name: Constants.clickToLoadRulesListName,
trackerData: nil,
fallbackTrackerData: dataSet)
result.append(CTLRulesList)
}

result.append(additionalRulesList)
return result
}
}
7 changes: 5 additions & 2 deletions DuckDuckGo/ContentBlocker/ScriptSourceProviding.swift
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,15 @@ struct ScriptSourceProvider: ScriptSourceProviding {
private func buildClickToLoadSource() -> String {
// For now bundle FB SDK and associated config, as they diverged from the extension
let fbSDK = loadTextFile("fb-sdk", "js")
let config = loadTextFile("clickToLoadConfig", "json")
var config = loadTextFile("clickToLoadConfig", "json")!
if #unavailable(OSX 11) { // disable CTL for Catalina and earlier
config = "{}"
}
let proximaRegFont = loadFont("ProximaNova-Reg-webfont", "woff2")
let proximaBoldFont = loadFont("ProximaNova-Bold-webfont", "woff2")
return ContentBlockerRulesUserScript.loadJS("clickToLoad", from: .main, withReplacements: [
"${fb-sdk.js}": fbSDK!,
"${clickToLoadConfig.json}": config!,
"${clickToLoadConfig.json}": config,
"${proximaRegFont}": proximaRegFont!,
"${proximaBoldFont}": proximaBoldFont!
])
Expand Down
3 changes: 3 additions & 0 deletions DuckDuckGo/Tab/TabExtensions/FBProtectionTabExtension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ extension FBProtectionTabExtension {

@discardableResult
private func setFBProtection(enabled: Bool) -> Bool {
if #unavailable(OSX 11) { // disable CTL for Catalina and earlier
return false
}
guard self.fbBlockingEnabled != enabled else { return false }
guard let userContentController else {
assertionFailure("Missing UserContentController")
Expand Down