Unified Diff: desktop-options.js
Issue 29693558:
Issue 6009 - Convert URLs into domains when adding domain to whitelist (Closed)
Patch Set:
Created Feb. 9, 2018, 10:18 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: desktop-options.js |
| =================================================================== |
| --- a/desktop-options.js |
| +++ b/desktop-options.js |
| @@ -918,10 +918,10 @@ |
| { |
| setLinks("enable-acceptable-ads-description", link); |
| }); |
| - setElementText(E("tracking-warning-1"), "options_tracking_warning_1", |
| + setElementText(E("tracking-warning-1"), "options_tracking_warning_1", |
|
saroyanm
2018/02/14 16:31:06
Detail: Please do not forget to rebase before push
|
| [getMessage("common_feature_privacy_title"), |
| - getMessage("options_acceptableAds_ads_label")]); |
| - setElementText(E("tracking-warning-3"), "options_tracking_warning_3", |
| + getMessage("options_acceptableAds_ads_label")]); |
| + setElementText(E("tracking-warning-3"), "options_tracking_warning_3", |
| [getMessage("options_acceptableAds_privacy_label")]); |
| getDocLink("privacy_friendly_ads", (link) => |
| @@ -1211,11 +1211,13 @@ |
| break; |
| } |
| } |
| - if (domain.value) |
| + const value = domain.value.trim(); |
| + if (value) |
| { |
| + const host = /^https?:\/\//i.test(value) ? new URL(value).host : value; |
| sendMessageHandleErrors({ |
| type: "filters.add", |
| - text: "@@||" + domain.value.toLowerCase() + "^$document" |
| + text: "@@||" + host.toLowerCase() + "^$document" |
| }); |
| } |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
