From 89b396e35612ed7fcdc8b80a9caa5e4bf3ddd281 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Tue, 3 Jun 2025 10:33:36 +0200 Subject: [PATCH] Eyeo Adblock for Cromite: fix windows settings (#2124) --- build/patches/Eyeo-Adblock-for-Cromite.patch | 47 +++++++++++++------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/build/patches/Eyeo-Adblock-for-Cromite.patch b/build/patches/Eyeo-Adblock-for-Cromite.patch index 2961bf45..8c46f8ee 100644 --- a/build/patches/Eyeo-Adblock-for-Cromite.patch +++ b/build/patches/Eyeo-Adblock-for-Cromite.patch @@ -28,7 +28,7 @@ suit Cromite logic. ...hrome_browser_main_extra_parts_profiles.cc | 2 - chrome/browser/resources/settings/BUILD.gn | 2 + .../settings/adblock_page/adblock_page.html | 212 + - .../settings/adblock_page/adblock_page.ts | 286 + + .../settings/adblock_page/adblock_page.ts | 303 + .../settings/basic_page/basic_page.html | 7 + .../settings/basic_page/basic_page.ts | 1 + .../resources/settings/page_visibility.ts | 1 + @@ -125,7 +125,7 @@ suit Cromite logic. .../renderer/core/exported/web_document.cc | 13 +- .../blink/renderer/core/html/html_element.cc | 8 +- .../definitions/adblock_private.d.ts | 14 + - 120 files changed, 9175 insertions(+), 617 deletions(-) + 120 files changed, 9192 insertions(+), 617 deletions(-) rename chrome/browser/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (59%) create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.html create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.ts @@ -1375,7 +1375,7 @@ diff --git a/chrome/browser/resources/settings/adblock_page/adblock_page.ts b/ch new file mode 100644 --- /dev/null +++ b/chrome/browser/resources/settings/adblock_page/adblock_page.ts -@@ -0,0 +1,286 @@ +@@ -0,0 +1,303 @@ +/* + This file is part of Bromite. + @@ -1432,21 +1432,38 @@ new file mode 100644 + return getTemplate(); + } + ++ static get properties() { ++ return { ++ customSubscriptionInput: String, ++ customFilterInput: String, ++ allowedDomainInput: String, ++ additionalMessage: String, ++ additionalMessageIcon: String, ++ countEnabled: Number, ++ allowedDomainsCount: Number, ++ isEnablePrivilegedFiltersToggle_: Boolean, ++ customSubscriptions: Array, ++ customFilters: Array, ++ allowedDomains: Array, ++ subscriptions: Array, ++ } ++ } ++ + // input fields updated by html -+ public customSubscriptionInput: string; -+ public customFilterInput: string; -+ public allowedDomainInput: string; -+ public additionalMessage: string; -+ public additionalMessageIcon: string; -+ public countEnabled: number; -+ public allowedDomainsCount: number; -+ public isEnablePrivilegedFiltersToggle_: boolean; ++ declare private customSubscriptionInput: string; ++ declare private customFilterInput: string; ++ declare private allowedDomainInput: string; ++ declare private additionalMessage: string; ++ declare private additionalMessageIcon: string; ++ declare private countEnabled: number; ++ declare private allowedDomainsCount: number; ++ declare private isEnablePrivilegedFiltersToggle_: boolean; + + // models that will fill templates lists in html -+ public customSubscriptions: Subscription[] = []; -+ public customFilters: Array = []; -+ public allowedDomains: Array = []; -+ public subscriptions: Subscription[] = []; ++ declare private customSubscriptions: Subscription[]; ++ declare private customFilters: Array; ++ declare private allowedDomains: Array; ++ declare private subscriptions: Subscription[]; + + private syncSubscriptions() { + this.subscriptions = []