feat(util): add timeOut func

dewanakl · Dec 10, 2024 · 13047b4 · 13047b4
1 parent 2022f51
commit 13047b4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/js/card.js b/js/card.js
@@ -13,7 +13,7 @@ export const card = (() => {
     let tracker = null;
     let showHide = null;
 
-    const maxCommentLength = 150;
+    const maxCommentLength = 250;
 
     const renderLoading = () => {
         const comments = document.getElementById('comments');

diff --git a/js/guest.js b/js/guest.js
@@ -113,7 +113,7 @@ export const guest = (() => {
 
         theme.spyTop();
         theme.showButtonChangeTheme();
-        setTimeout(animation, 1500);
+        util.timeOut(animation, 1500);
     };
 
     const init = () => {

diff --git a/js/request.js b/js/request.js
@@ -76,8 +76,8 @@ export const request = (method, path) => {
                     return res.blob().then((blob) => ({ blob, filename }));
                 })
                 .then((res) => {
-                    if (!res) {
-                        return null;
+                    if (res === null) {
+                        return false;
                     }
 
                     const { blob, filename } = res;
@@ -93,6 +93,8 @@ export const request = (method, path) => {
 
                     document.body.removeChild(link);
                     window.URL.revokeObjectURL(href);
+
+                    return true;
                 })
                 .catch((err) => {
                     alert(err);

diff --git a/js/util.js b/js/util.js
@@ -8,16 +8,19 @@ export const util = (() => {
         let op = parseInt(element.style.opacity);
 
         let clear = null;
-        clear = setInterval(() => {
+        const callback = () => {
             if (op > 0) {
-                element.style.opacity = op.toString();
+                element.style.opacity = op.toFixed(3);
                 op -= speed;
-            } else {
-                clearInterval(clear);
-                clear = null;
-                element.remove();
+                return;
             }
-        }, 10);
+
+            clearInterval(clear);
+            clear = null;
+            element.remove();
+        };
+
+        clear = setInterval(callback, 10);
     };
 
     const escapeHtml = (unsafe) => {
@@ -29,6 +32,17 @@ export const util = (() => {
             .replace(/'/g, '&#039;');
     };
 
+    const timeOut = (callback, timeout) => {
+        let clear = null;
+        const c = () => {
+            callback();
+            clearTimeout(clear);
+            clear = null;
+        };
+
+        clear = setTimeout(c, timeout);
+    };
+
     const disableButton = (button, message = 'Loading..') => {
 
         button.disabled = true;
@@ -58,11 +72,7 @@ export const util = (() => {
         };
     };
 
-    const animate = (svg, timeout, classes) => {
-        setTimeout(() => {
-            svg.classList.add(classes);
-        }, timeout);
-    };
+    const animate = (svg, timeout, classes) => timeOut(() => svg.classList.add(classes), timeout);
 
     const modal = (img) => {
         document.getElementById('show-modal-image').src = img.src;
@@ -90,14 +100,9 @@ export const util = (() => {
         const tmp = button.innerHTML;
         button.innerHTML = message ? message : '<i class="fa-solid fa-check"></i>';
 
-        let clear = null;
-        clear = setTimeout(() => {
+        timeOut(() => {
             button.disabled = false;
             button.innerHTML = tmp;
-
-            clearTimeout(clear);
-            clear = null;
-            return;
         }, timeout);
     };
 
@@ -122,6 +127,7 @@ export const util = (() => {
         copy,
         close,
         modal,
+        timeOut,
         opacity,
         animate,
         escapeHtml,