X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fcomponents%2FMessage.vue;h=5a1e0eaadc2beb72948133eca646d4adf49fe4da;hb=e3bd2ecc2ca874270282c3c42813b8053d67dcbd;hp=fcb0fbba9bb79adf4770dfa8c094a53152a9a3d4;hpb=b9c5fcf085bed9c6100283133531b36bfbb06cf0;p=github%2Fbastienwirtz%2Fhomer.git diff --git a/src/components/Message.vue b/src/components/Message.vue index fcb0fbb..5a1e0ea 100644 --- a/src/components/Message.vue +++ b/src/components/Message.vue @@ -1,9 +1,16 @@ @@ -13,19 +20,25 @@ export default { props: { item: Object, }, - created: function () { + data: function () { + return { + show: false, + message: {}, + }; + }, + created: async function () { // Look for a new message if an endpoint is provided. - let that = this; + this.message = Object.assign({}, this.item); if (this.item && this.item.url) { - this.getMessage(this.item.url).then(function (message) { - // keep the original config value if no value is provided by the endpoint - for (const prop of ["title", "style", "content"]) { - if (prop in message && message[prop] !== null) { - that.item[prop] = message[prop]; - } + const fetchedMessage = await this.getMessage(this.item.url); + // keep the original config value if no value is provided by the endpoint + for (const prop of ["title", "style", "content"]) { + if (prop in fetchedMessage && fetchedMessage[prop] !== null) { + this.message[prop] = fetchedMessage[prop]; } - }); + } } + this.show = this.message.title || this.message.content; }, methods: { getMessage: function (url) {