X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=assets%2Fcommon%2Fjs%2Fshaare-batch.js;h=3324193f9f00a1fc6cb32fb3112367b9d9342dac;hb=3d6278e86fc5ab5756ce39ef3d1f299fb614ca2a;hp=9f61299327ccc4ca387fd74b2f02e639c84d8fde;hpb=5d8de7587d67b5c3e5d1fed8562d9b87ecde80c1;p=github%2Fshaarli%2FShaarli.git

diff --git a/assets/common/js/shaare-batch.js b/assets/common/js/shaare-batch.js
index 9f612993..3324193f 100644
--- a/assets/common/js/shaare-batch.js
+++ b/assets/common/js/shaare-batch.js
@@ -15,7 +15,7 @@ const sendBookmarkForm = (basePath, formElement) => {
         alert(`An error occurred. Return code: ${xhr.status}`);
         reject();
       } else {
-        formElement.remove();
+        formElement.closest('.edit-link-container').remove();
         resolve();
       }
     };
@@ -32,7 +32,7 @@ const sendBookmarkDelete = (buttonElement, formElement) => (
         alert(`An error occurred. Return code: ${xhr.status}`);
         reject();
       } else {
-        formElement.remove();
+        formElement.closest('.edit-link-container').remove();
         resolve();
       }
     };
@@ -80,13 +80,27 @@ const redirectIfEmptyBatch = (basePath, formElements, path) => {
       saveAllButton.addEventListener('click', (e) => {
         e.preventDefault();
 
+        const forms = [...getForms()];
+        const nbForm = forms.length;
+        let current = 0;
+        const progressBar = document.querySelector('.progressbar > div');
+        const progressBarCurrent = document.querySelector('.progressbar-current');
+
+        document.querySelector('.dark-layer').style.display = 'block';
+        document.querySelector('.progressbar-max').innerHTML = nbForm;
+        progressBarCurrent.innerHTML = current;
+
         const promises = [];
-        [...getForms()].forEach((formElement) => {
-          promises.push(sendBookmarkForm(basePath, formElement));
+        forms.forEach((formElement) => {
+          promises.push(sendBookmarkForm(basePath, formElement).then(() => {
+            current += 1;
+            progressBar.style.width = `${(current * 100) / nbForm}%`;
+            progressBarCurrent.innerHTML = current;
+          }));
         });
 
         Promise.all(promises).then(() => {
-          window.location.href = basePath || '/';
+          window.location.href = `${basePath}/`;
         });
       });
     });