From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Feb 2019 14:41:57 +0000 (-0500)
Subject: Pagination cycles forward until it doesn't - buttons don't properly lose 'disabled'
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8113ea90003672d1fecac468f8c63c7241d287e6;p=WP-Plugins%2Fglm-member-db.git

Pagination cycles forward until it doesn't - buttons don't properly lose 'disabled'
---

diff --git a/views/admin/manageDashboard/adminSearch/pagination.html b/views/admin/manageDashboard/adminSearch/pagination.html
index 1d3a0129..c5730869 100644
--- a/views/admin/manageDashboard/adminSearch/pagination.html
+++ b/views/admin/manageDashboard/adminSearch/pagination.html
@@ -1,2 +1,2 @@
-<span class="pagination button button-secondary glm-button"{if !$prevStart} disabled{/if}>Previous {$limit} {$terms.term_member_plur_cap}</span>
-<span class="pagination button button-secondary glm-button"{if !$nextStart} disabled{/if}>Next {$limit} {$terms.term_member_plur_cap}</span>
+<span class="pagination button button-secondary previous-button glm-button"{if !$prevStart} disabled{/if}>Previous {$limit} {$terms.term_member_plur_cap}</span>
+<span class="pagination button button-secondary next-button glm-button"{if !$nextStart} disabled{/if}>Next {$limit} {$terms.term_member_plur_cap}</span>
\ No newline at end of file
diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index 35995476..1c7b4c5c 100644
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -1,11 +1,11 @@
 
 <div id="glm-manage-member-dashboard">
     {include file='admin/manageDashboard/adminSearch/searchHeader.html'}
+
     <div id="glm-admin-member-list" class="row admin-member-list">
         {if $paging}
             {include file='admin/manageDashboard/adminSearch/pagination.html'}
         {/if}
-    
         <div id="glm-admin-list-columns">
             <span class="member-record-header" id="member-record-image"></span>
             <span class="member-record-header" id="member-record-name">Name</span>
@@ -14,8 +14,8 @@
             <span class="member-record-header" id="member-record-featured">Featured</span>
         </div>
         
-    
         <div id="member-results-container"></div>
+
         {if $paging}
             {include file='admin/manageDashboard/adminSearch/pagination.html'}
         {/if}
@@ -23,6 +23,7 @@
             <img class="glm-list-loader" src="{$assetsUrl}/loader.gif" alt="">
         </div>
     </div>
+
     <div id="edit-screen" class="edit-screen sidenav"></div>
 </div>
 <style>
@@ -179,32 +180,46 @@
                 "POST",
             );
         });
-        console.log( $("#nextStart").attr("nextStart"));
+        // console.log( $("#nextStart").attr("nextStart"));
         $(document).on("click", ".pagination", function(e){
-            // listData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined;
-            // listData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined;
-            // listData.filterPending  = $("input[name='pendingSearch']:checked").length > 0 ? true : undefined;
-            listData.pageSelect = $(this).text();
-            listData.prevStart = '{$prevStart}';
-            listData.nextStart = $("#nextStart").attr("data-nextStart");
-            listData.limit = '{$limit}';
-            
-            // listData.nextStart = 'b';
-            // listData.limit = 'c';
-            //console.log(listData);
-            console.log('{$nextStart}');
-            Glma.manageMember(
-                listData,
-                $("#glm-admin-search-overlay").fadeOut('slow'), 
-                function(data) {
-                    $("#member-results-container").html(data.searchData);
-                    console.log(data.searchData);
-                },
-                function(error) {
-                    console.log(error);
-                },
-                "POST"
-            );
+            if (!$(this).attr("disabled")) {
+                // listData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined;
+                // listData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined;
+                // listData.filterPending  = $("input[name='pendingSearch']:checked").length > 0 ? true : undefined;
+                listData.pageSelect = $(this).text();
+                listData.prevStart = $("#pagination-data").attr("data-prevStart");
+                if (listData.prevStart) {
+                    console.log("Prevstart enabled");
+                    $(".pagination.previous-button").removeAttr("disabled");
+                } else {
+                    console.log("Prevstart disabled");
+                    $(".pagination.previous-button").attr("disabled", "disabled");
+                }
+
+                listData.nextStart = $("#pagination-data").attr("data-nextStart");
+                if (listData.nextStart) {
+                    console.log("Nextstart enabled");
+                    $(".pagination.next-button").removeAttr("disabled");
+                } else {
+                    console.log("Nextstart disabled");
+                    $(".pagination.next-button").attr("disabled", "disabled");
+                }
+
+                listData.limit = '{$limit}';
+                
+                Glma.manageMember(
+                    listData,
+                    $("#glm-admin-search-overlay").fadeOut('slow'), 
+                    function(data) {
+                        $("#member-results-container").html(data.searchData);
+                        //console.log(data.searchData);
+                    },
+                    function(error) {
+                        console.log(error);
+                    },
+                    "POST"
+                );
+            }
         });
             
         $(document).on("click", "#deleteMemberInfoButton",function(e){
diff --git a/views/admin/manageDashboard/list.html b/views/admin/manageDashboard/list.html
index 5debb650..97e74401 100644
--- a/views/admin/manageDashboard/list.html
+++ b/views/admin/manageDashboard/list.html
@@ -1,6 +1,6 @@
+    <span id="pagination-data" {if $prevStart}data-prevStart="{$prevStart}"{/if}{if $nextStart}data-nextStart="{$nextStart}"{/if}{if $limit}data-limit="{$limit}"{/if}></span>
 
     {if $haveMembers}
-    <input id="nextStart" type="hidden" data-nextStart="{$nextStart}">
         {foreach $members as $member}
             <div class="member-record" data-id="{$member.id}">
                 <span class="member-record-column member-record-logo">logo</span>
@@ -12,4 +12,4 @@
         {/foreach}
     {else}
         <div id="no-results">No Members</div>
-    {/if}
+    {/if}
\ No newline at end of file