From 7951192cd98263a2e5c9e1010f1299c651f82cef Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 25 May 2020 16:11:05 +0300 Subject: Improve settings-modal async loading, update vue to 2.6.11 to be able to use Vue.observable, to implmement resettable async component --- src/components/big_spinner/big_spinner.vue | 13 ++++++++ src/components/error_window/error_window.vue | 41 +++++++++++++++++++++++++ src/components/settings_modal/settings_modal.js | 13 +++++++- 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 src/components/big_spinner/big_spinner.vue create mode 100644 src/components/error_window/error_window.vue (limited to 'src/components') diff --git a/src/components/big_spinner/big_spinner.vue b/src/components/big_spinner/big_spinner.vue new file mode 100644 index 00000000..cda28de5 --- /dev/null +++ b/src/components/big_spinner/big_spinner.vue @@ -0,0 +1,13 @@ + + + diff --git a/src/components/error_window/error_window.vue b/src/components/error_window/error_window.vue new file mode 100644 index 00000000..ddb4ba00 --- /dev/null +++ b/src/components/error_window/error_window.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js index d38c5751..60d14649 100644 --- a/src/components/settings_modal/settings_modal.js +++ b/src/components/settings_modal/settings_modal.js @@ -1,9 +1,20 @@ import Modal from 'src/components/modal/modal.vue' +import BigSpinner from 'src/components/big_spinner/big_spinner.vue' +import ErrorWindow from 'src/components/error_window/error_window.vue' +import getResettableAsyncComponent from 'src/services/resettable_async_component.js' const SettingsModal = { components: { Modal, - SettingsModalContent: () => import('./settings_modal_content.vue') + SettingsModalContent: getResettableAsyncComponent( + () => import('./settings_modal_content.vue'), + { + loading: BigSpinner, + error: ErrorWindow, + delay: 0, + timeout: 3000 + } + ) }, computed: { modalActivated () { -- cgit v1.2.3-70-g09d2