Skip to content

Commit

Permalink
- client: Don't normalise disallowed domains
Browse files Browse the repository at this point in the history
Close #1820

Squashed commit of the following:

commit 0c758dd
Merge: 15650db f5a1f31
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:22:00 2020 +0300

    Merge branch 'master' into fix/1820

commit 15650db
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 29 12:01:51 2020 +0300

    '- client: Don't normalise disallowed domains'
  • Loading branch information
ArtemBaskal committed Jul 3, 2020
1 parent f5a1f31 commit 9640752
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion client/src/components/Header/Menu.js
Expand Up @@ -37,8 +37,8 @@ const FILTERS_ITEMS = [
{ route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
{ route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
{ route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
{ route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
];

class Menu extends Component {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Settings/Dns/Access/Form.js
Expand Up @@ -46,7 +46,7 @@ const Form = (props) => {
type="text"
className="form-control form-control--textarea font-monospace"
disabled={disabled}
normalizeOnBlur={normalizeMultiline}
normalizeOnBlur={id === 'disallowed_clients' ? normalizeMultiline : undefined}
/>
</div>;

Expand Down

0 comments on commit 9640752

Please sign in to comment.