Преглед изворни кода

Fix problem with banners not closing properly.

Lee Morgan пре 5 година
родитељ
комит
e4fc643f84

+ 5 - 5
views/dashboardPage/bundle.js

@@ -1561,13 +1561,13 @@ controller = {
         banner.children[1].innerText = text;
         container.appendChild(banner);
 
-        // let timer = setTimeout(()=>{
-        //     container.removeChild(banner);
-        // }, 10000);
+        let timer = setTimeout(()=>{
+            container.removeChild(banner);
+        }, 10000);
 
-        document.getElementById("closeBanner").addEventListener("click", ()=>{
+        banner.children[2].addEventListener("click", ()=>{
             container.removeChild(banner);
-            // clearTimeout(timer);
+            clearTimeout(timer);
         });
 
         

+ 1 - 1
views/dashboardPage/dashboard.ejs

@@ -121,7 +121,7 @@
                             </svg>
                         </div>
                         <p></p>
-                        <button id="closeBanner">
+                        <button>
                             <svg width="18" height="18" viewBox="0 0 24 24" fill="rgb(200, 0, 0)" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
                                 <circle cx="12" cy="12" r="10"></circle>
                                 <line x1="15" y1="9" x2="9" y2="15"></line>

+ 5 - 5
views/dashboardPage/js/dashboard.js

@@ -259,13 +259,13 @@ controller = {
         banner.children[1].innerText = text;
         container.appendChild(banner);
 
-        // let timer = setTimeout(()=>{
-        //     container.removeChild(banner);
-        // }, 10000);
+        let timer = setTimeout(()=>{
+            container.removeChild(banner);
+        }, 10000);
 
-        document.getElementById("closeBanner").addEventListener("click", ()=>{
+        banner.children[2].addEventListener("click", ()=>{
             container.removeChild(banner);
-            // clearTimeout(timer);
+            clearTimeout(timer);
         });