aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-11-23 09:31:57 +0100
committerLibravatar GitHub <noreply@github.com>2017-11-23 09:31:57 +0100
commit2c3e8fd3405c210eee2537a2b9e62db0716481ea (patch)
treef4f572974124f1565d77645348551cb71135e2c1 /src
parentMerge pull request #324 from meetfranz/feature/beta-14-bugfixing (diff)
parentDo not strip www from custom urls (diff)
downloadferdium-app-2c3e8fd3405c210eee2537a2b9e62db0716481ea.tar.gz
ferdium-app-2c3e8fd3405c210eee2537a2b9e62db0716481ea.tar.zst
ferdium-app-2c3e8fd3405c210eee2537a2b9e62db0716481ea.zip
Merge pull request #327 from BeneStem/master
Do not strip www from custom urls
Diffstat (limited to 'src')
-rw-r--r--src/components/settings/services/EditServiceForm.js2
-rw-r--r--src/models/Service.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 753781507..36cefe87c 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -114,7 +114,7 @@ export default class EditServiceForm extends Component {
114 if (recipe.validateUrl && values.customUrl) { 114 if (recipe.validateUrl && values.customUrl) {
115 this.setState({ isValidatingCustomUrl: true }); 115 this.setState({ isValidatingCustomUrl: true });
116 try { 116 try {
117 values.customUrl = normalizeUrl(values.customUrl); 117 values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false });
118 isValid = await recipe.validateUrl(values.customUrl); 118 isValid = await recipe.validateUrl(values.customUrl);
119 } catch (err) { 119 } catch (err) {
120 console.warn('ValidateURL', err); 120 console.warn('ValidateURL', err);
diff --git a/src/models/Service.js b/src/models/Service.js
index d0985969b..958e4b11e 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -73,7 +73,7 @@ export default class Service {
73 if (this.recipe.hasCustomUrl && this.customUrl) { 73 if (this.recipe.hasCustomUrl && this.customUrl) {
74 let url; 74 let url;
75 try { 75 try {
76 url = normalizeUrl(this.customUrl); 76 url = normalizeUrl(this.customUrl, { stripWWW: false });
77 } catch (err) { 77 } catch (err) {
78 console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`); 78 console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
79 } 79 }