diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-10-12 14:10:58 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-10-12 14:10:58 +0200 |
| commit | 5c2eb89b0fe280eaf819b9690cf15146a81d8e0a (patch) | |
| tree | df2af0af918dadbd4d3540791bda4ce8851ee4a6 /src | |
| parent | 3181da77bbfcdd37969083a2f44b2172efe6d477 (diff) | |
| parent | 5db0aae9c57d53d7a5d4a4e11d23591b4a8b4682 (diff) | |
Merge branch 'master' of https://github.com/nextcloud/contacts into master
zsh:1: command not found: q
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Properties/PropertyText.vue | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue index f1273a05..2a6efe2c 100644 --- a/src/components/Properties/PropertyText.vue +++ b/src/components/Properties/PropertyText.vue @@ -72,7 +72,7 @@ :class="{'property__value--with-ext': haveExtHandler}" type="text" class="property__value" - :placeholder="localType.placeholder" + :placeholder="placeholder" @input="updateValue"> <!-- external link --> @@ -158,6 +158,18 @@ export default { haveExtHandler() { return this.externalHandler.trim() !== '' && this.localValue && this.localValue.length > 0 }, + + /** + * Return the selected type placeholder if any + * or the propModel default placeholder + * @returns {string} + */ + placeholder() { + if (this.localType?.placeholder) { + return this.localType.placeholder + } + return this.propModel.placeholder + }, }, mounted() { |