fixed the Previous Page button logic

CocoZDev · Nov 23, 2018 · 901ff91 · 901ff91
1 parent c54a448
commit 901ff91
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -405,7 +405,7 @@ form .btn-success:focus {
 ul.pager li span {
   background-color: green;
   color: white;
-  font-size: 16px;
+  font-size: 15px;
   border-radius: 5px;
   border: none;
 }

diff --git a/assets/javascript/events.js b/assets/javascript/events.js
@@ -31,9 +31,13 @@ function loaderStatusCheck() {
       $("#loader").removeClass("hidden");
       $("#next-events").addClass("hidden");
       $("#previous-events").addClass("hidden");
-   } else if (showLoader == false) {
+   } else if (showLoader == false && pageNum == 1) {
       $("#loader").addClass("hidden");
-   }
+      $("#previous-events").addClass("hidden");
+   } else if (showLoader == false && pageNum !== 1) {
+      $("#loader").addClass("hidden");
+      $("#previous-events").removeClass("hidden");
+   };
    // alert("showLoader: " + showLoader);
    console.log("showLoader: " + showLoader);
 };
@@ -82,7 +86,7 @@ function queryEvents(eventType, address, noOfRecords, dateRange)
          console.log("Event #" + (i+1) + " displayed.");
          showLoader = false;
          loaderStatusCheck();
-         addMoreEventBtn();
+         $("#next-events").removeClass("hidden");
       };
 
    });
@@ -111,14 +115,6 @@ function createEventDiv(event){
     eventsHolder.append(eventDIV);
 }
 
-// Add More Event Button 
-function addMoreEventBtn() {
-      // setTimeout(function() {
-      $("#next-events").removeClass("hidden");
-      // }, 2000);
-      $("#previous-events").removeClass("hidden");
-};
-
 //TO DISPLAY THE SELECTED EVENT ADDRESS ON THE ADJACENT MAP
 function displayAddressOnMap(item){
    displayOnMap(item.getAttribute('data-info'));

diff --git a/index.html b/index.html
@@ -104,8 +104,8 @@ <h4 class="search-heading">Filter by Category:</h4>
 				<div class="row">
 					<nav aria-label="...">
 						<ul class="pager">
-							<li class="previous" id="previous-events"><span aria-hidden="true">&larr; Previous Page</span></li>
-							<li class="next" id="next-events"><span aria-hidden="true">Next Page &rarr;</span></button>
+							<li class="previous hidden" id="previous-events"><span aria-hidden="true">&larr; Previous Page</span></li>
+							<li class="next hidden" id="next-events"><span aria-hidden="true">Next Page &rarr;</span></button>
 						</ul>
 					</nav>
 				</div>