From 8ab790ac052e4abb8c260782b82fe48b70c440ef Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Mon, 4 May 2020 11:02:45 +0200 Subject: [PATCH] Move the loading spinner into the main render content --- src/vpu-official-signature-pdf-upload.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vpu-official-signature-pdf-upload.js b/src/vpu-official-signature-pdf-upload.js index c4329d1..aa440e2 100644 --- a/src/vpu-official-signature-pdf-upload.js +++ b/src/vpu-official-signature-pdf-upload.js @@ -285,11 +285,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem } render() { - if (this.isLoading()) { - return html`<vpu-mini-spinner></vpu-mini-spinner>`; - } return html` - <div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions()})}"> + <div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}"> <div class="field"> <h2>${i18n.t('official-pdf-upload.upload-field-label')}</h2> <div class="control"> @@ -331,12 +328,15 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem </div> </div> </div> - <div class="notification is-warning ${classMap({hidden: this.isLoggedIn()})}"> + <div class="notification is-warning ${classMap({hidden: this.isLoggedIn() || this.isLoading()})}"> ${i18n.t('error-login-message')} </div> - <div class="notification is-danger ${classMap({hidden: this.hasSignaturePermissions() || !this.isLoggedIn()})}"> + <div class="notification is-danger ${classMap({hidden: this.hasSignaturePermissions() || !this.isLoggedIn() || this.isLoading()})}"> ${i18n.t('error-permission-message')} </div> + <div class="${classMap({hidden: !this.isLoading()})}"> + <vpu-mini-spinner></vpu-mini-spinner> + </div> `; } } -- GitLab