[metadata] Page de chargement aussi pour la lecture pdf

24eme · Oct 12, 2024 · 186f795 · 186f795
1 parent 591e92d
commit 186f795
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/public/js/metadata.js b/public/js/metadata.js
@@ -4,6 +4,7 @@ let pdffile = null
 let deletedMetadata = [];
 let isLocalPath = false;
 let hasModifications = false;
+const modalLoading = new bootstrap.Modal('#modalLoading')
 
 function responsiveDisplay() {
     let menu = document.getElementById('sidebarTools');
@@ -259,6 +260,7 @@ async function pageUpload() {
 }
 
 async function pageMetadata(url) {
+    modalLoading.show();
     document.querySelector('body').classList.add('bg-light');
     document.getElementById('page-upload').classList.add('d-none');
     document.getElementById('page-metadata').classList.remove('d-none');
@@ -272,12 +274,11 @@ async function pageMetadata(url) {
     if(url && url.match(/^cache:\/\//)) {
         await loadFileFromCache(url.replace(/^cache:\/\//, ''));
     } else if (url) {
-        const modalLoading = new bootstrap.Modal('#modalLoading')
-        modalLoading.show();
         await loadFileFromUrl(url);
-        modalLoading.hide();
     }
 
+    document.getElementById('modalLoading').querySelector('p').innerText = 'Chargement du PDF'
+
     if(!document.getElementById('input_pdf_upload').files.length) {
         alert("Chargement du PDF impossible");
         document.location = '/metadata';
@@ -286,7 +287,8 @@ async function pageMetadata(url) {
 
     responsiveDisplay();
     createEventsListener();
-    loadPDF(document.getElementById('input_pdf_upload').files[0]);
+    await loadPDF(document.getElementById('input_pdf_upload').files[0]);
+    modalLoading.hide();
 };
 
 

diff --git a/templates/metadata.html.php b/templates/metadata.html.php
@@ -87,7 +87,7 @@
     <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content bg-transparent border-0">
             <div class="modal-body text-center my-5 text-white fs-4">
-                <p class="monospace">Récupération du fichier en cours ...</p>
+                <p>Récupération du fichier</p>
                 <div class="spinner-border" role="status"></div>
             </div>
         </div>