diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-11-07 12:25:00 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-07 12:25:00 +0100 |
| commit | c55885e69e195e4413fda3bffffafeaee7c0c9d5 (patch) | |
| tree | b13a2894796e45df60c92cf4c999b2974d400091 /src/models/Service.js | |
| parent | Fix lint errors (diff) | |
| parent | fix(App): Prevent app from redirecting when dropping link (diff) | |
| download | ferdium-app-c55885e69e195e4413fda3bffffafeaee7c0c9d5.tar.gz ferdium-app-c55885e69e195e4413fda3bffffafeaee7c0c9d5.tar.zst ferdium-app-c55885e69e195e4413fda3bffffafeaee7c0c9d5.zip | |
Merge branch 'develop' into reload-crashed-service
Diffstat (limited to 'src/models/Service.js')
| -rw-r--r-- | src/models/Service.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/models/Service.js b/src/models/Service.js index 89d6748b5..c7276821a 100644 --- a/src/models/Service.js +++ b/src/models/Service.js | |||
| @@ -58,7 +58,12 @@ export default class Service { | |||
| 58 | 58 | ||
| 59 | @computed get url() { | 59 | @computed get url() { |
| 60 | if (this.recipe.hasCustomUrl && this.customUrl) { | 60 | if (this.recipe.hasCustomUrl && this.customUrl) { |
| 61 | let url = normalizeUrl(this.customUrl); | 61 | let url; |
| 62 | try { | ||
| 63 | url = normalizeUrl(this.customUrl); | ||
| 64 | } catch (err) { | ||
| 65 | console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`); | ||
| 66 | } | ||
| 62 | 67 | ||
| 63 | if (typeof this.recipe.buildUrl === 'function') { | 68 | if (typeof this.recipe.buildUrl === 'function') { |
| 64 | url = this.recipe.buildUrl(url); | 69 | url = this.recipe.buildUrl(url); |