diff options
author | vantezzen <hello@vantezzen.io> | 2020-02-12 11:20:25 +0100 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2020-02-12 11:20:25 +0100 |
commit | 20830e4f896526db66d9b3ace0ebc421620c4049 (patch) | |
tree | f88394b9e6c40701a0eb03aca7ea342f30df7f96 /src/components | |
parent | Fix lint (diff) | |
parent | Improve Bug report template (diff) | |
download | ferdium-app-20830e4f896526db66d9b3ace0ebc421620c4049.tar.gz ferdium-app-20830e4f896526db66d9b3ace0ebc421620c4049.tar.zst ferdium-app-20830e4f896526db66d9b3ace0ebc421620c4049.zip |
Merge branch 'develop' into publish-debug
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 2 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index fa34ac60b..89c82c7f8 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -169,7 +169,7 @@ export default @observer class EditServiceForm extends Component { | |||
169 | if (recipe.validateUrl && values.customUrl) { | 169 | if (recipe.validateUrl && values.customUrl) { |
170 | this.setState({ isValidatingCustomUrl: true }); | 170 | this.setState({ isValidatingCustomUrl: true }); |
171 | try { | 171 | try { |
172 | values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false }); | 172 | values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false, removeTrailingSlash: false }); |
173 | isValid = await recipe.validateUrl(values.customUrl); | 173 | isValid = await recipe.validateUrl(values.customUrl); |
174 | } catch (err) { | 174 | } catch (err) { |
175 | console.warn('ValidateURL', err); | 175 | console.warn('ValidateURL', err); |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index f7868db50..2797a2dce 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -450,7 +450,7 @@ export default @observer class EditSettingsForm extends Component { | |||
450 | <Hr /> | 450 | <Hr /> |
451 | 451 | ||
452 | {isMac && <Toggle field={form.$('adaptableDarkMode')} />} | 452 | {isMac && <Toggle field={form.$('adaptableDarkMode')} />} |
453 | {!(isMac && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} disabled={isAdaptableDarkModeEnabled} />} | 453 | {!(isMac && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} />} |
454 | {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( | 454 | {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( |
455 | <> | 455 | <> |
456 | <Toggle field={form.$('universalDarkMode')} /> | 456 | <Toggle field={form.$('universalDarkMode')} /> |