Просмотр исходного кода

Bug fix: close button on banner was not working except on the SPA side.

Lee Morgan 5 лет назад
Родитель
Сommit
1b149efae3

+ 9 - 3
views/otherPages/landing.ejs

@@ -64,10 +64,16 @@
         <% include ../shared/loader %>
 
         <script>
-            setTimeout(()=>{
-                let banner = document.getElementById("banner");
+            let banner = document.getElementById("banner");
+            
+            let timer = setTimeout(()=>{
                 if(banner !== null) banner.style.display = "none";
-            }, 10000)
+            }, 10000);
+
+            document.getElementById("bannerButton").onclick = ()=>{
+                banner.style.display = "none";
+                clearTimeout(timer);
+            };
         </script>
     </body>
 </html>

+ 8 - 2
views/otherPages/login.ejs

@@ -47,10 +47,16 @@
         <% include ../shared/footer %>
 
         <script>
-            setTimeout(()=>{
-                let banner = document.getElementById("banner");
+            let banner = document.getElementById("banner");
+            
+            let timer = setTimeout(()=>{
                 if(banner !== null) banner.style.display = "none";
             }, 10000);
+
+            document.getElementById("bannerButton").onclick = ()=>{
+                banner.style.display = "none";
+                clearTimeout(timer);
+            };
         </script>
     </body>
 </html>

+ 9 - 3
views/otherPages/register.ejs

@@ -62,10 +62,16 @@
         <% include ../shared/footer %>
 
         <script>
-            setTimeout(()=>{
-                let banner = document.getElementById("banner");
+            let banner = document.getElementById("banner");
+            
+            let timer = setTimeout(()=>{
                 if(banner !== null) banner.style.display = "none";
-            }, 10000)
+            }, 10000);
+
+            document.getElementById("bannerButton").onclick = ()=>{
+                banner.style.display = "none";
+                clearTimeout(timer);
+            };
         </script>
     </body>
 </html>

+ 8 - 2
views/passwordResetPages/password.ejs

@@ -44,10 +44,16 @@
         </form>
 
         <script>
-            setTimeout(()=>{
-                let banner = document.getElementById("banner");
+            let banner = document.getElementById("banner");
+            
+            let timer = setTimeout(()=>{
                 if(banner !== null) banner.style.display = "none";
             }, 10000);
+
+            document.getElementById("bannerButton").onclick = ()=>{
+                banner.style.display = "none";
+                clearTimeout(timer);
+            };
         </script>
     </body>
 </html>

+ 1 - 1
views/shared/banner.ejs

@@ -20,7 +20,7 @@
         <% } %>
     </div>
     <p><%=banner.message%></p>
-    <button>
+    <button id="bannerButton">
         <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>