From 63695f55f822505cb2c7ec3ed09cf5c49b48637d Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sat, 19 Jun 2021 11:39:19 +0200
Subject: [PATCH] Start removing BootstrapVue in apimail: b-spinner
---
.../assets/vue/components/MessagesTable.vue | 16 ++++++++++++----
.../static/apimail/assets/vue/messages_table.js | 2 --
webpack.common.js | 1 +
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue b/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue
index 432c72068..e5fe79f28 100644
--- a/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue
+++ b/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue
@@ -370,10 +370,18 @@
@row-clicked="onMessageRowClicked"
>
<template v-slot:table-busy>
- <div class="text-center text-primary my-2">
- <b-spinner class="align-middle"></b-spinner>
- <strong>Loading...</strong>
- </div>
+ <button
+ class="btn btn-outline-primary"
+ type="button" disabled
+ >
+ <span
+ class="spinner-grow spinner-grow-sm"
+ role="status"
+ aria-hidden="true"
+ >
+ </span>
+ Loading...
+ </button>
</template>
<template v-slot:head(tab)="row">
<span v-if="tabbedMessages.length > 0">
diff --git a/scipost_django/apimail/static/apimail/assets/vue/messages_table.js b/scipost_django/apimail/static/apimail/assets/vue/messages_table.js
index 604e8ad24..644b46ac9 100644
--- a/scipost_django/apimail/static/apimail/assets/vue/messages_table.js
+++ b/scipost_django/apimail/static/apimail/assets/vue/messages_table.js
@@ -63,8 +63,6 @@ Vue.component('b-input-group-append', BInputGroupAppend)
Vue.use(ModalPlugin)
// Pagination
Vue.component('b-pagination', BPagination)
-// Spinner
-Vue.component('b-spinner', BSpinner)
// Tables
Vue.use(TablePlugin)
// Tabs
diff --git a/webpack.common.js b/webpack.common.js
index 25598455e..5b5bc0b23 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -16,6 +16,7 @@ module.exports = {
"./scipost_django/scipost/static/scipost/assets/js/api.js",
],
apimail: [
+ "./scipost_django/scipost/static/scipost/assets/js/base.js",
"./scipost_django/apimail/static/apimail/assets/vue/messages_table.js",
],
qr: [
--
GitLab