From e73918d6c31c137a2d36c65ebe445a324b4949cf Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 7 Mar 2019 11:42:38 -0500 Subject: [PATCH] testing the reset filters functionality --- js/memberManagement.js | 7 +++--- views/admin/manageDashboard/index.html | 31 ++++++++++++++------------ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/js/memberManagement.js b/js/memberManagement.js index 3224252c..079d1399 100644 --- a/js/memberManagement.js +++ b/js/memberManagement.js @@ -74,11 +74,12 @@ window.Glma = (function() { input.prop("checked", false) break; case "select2": - input.val("").trigger('change'); + //input.val("").trigger('change'); + console.log(input) + input.select2('val', null); + break; case "select": - - input.val(); input.prop('selectedIndex', 0); //Sets the first option as selected input.formSelect(); break; diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html index b808df77..f67cd380 100644 --- a/views/admin/manageDashboard/index.html +++ b/views/admin/manageDashboard/index.html @@ -102,23 +102,25 @@ "POST" ); - $(document).on("click", "#glm-admin-reset-filters", function(){ + $("#glm-admin-reset-filters").on("click", function(e){ + // e.stopPropagation(); $("#glm-admin-search-overlay").fadeIn('fast'); + // console.log("test"); window.Glma.resetFilters(); - window.Glma.deleteFilterFields(listData); - window.Glma.manageMember( - listData, - '', - function(data) { + // window.Glma.deleteFilterFields(listData); + // window.Glma.manageMember( + // listData, + // '', + // function(data) { - $("#member-results-container").html(data.searchData); - $("#glm-admin-search-overlay").fadeOut('slow'); - }, - function(error) { - console.log(error); - }, - "POST" - ); + // $("#member-results-container").html(data.searchData); + // $("#glm-admin-search-overlay").fadeOut('slow'); + // }, + // function(error) { + // console.log(error); + // }, + // "POST" + // ); }) $(".glm-search-checkbox").on("change", function(){ @@ -173,6 +175,7 @@ $(document).on("click",".member-record-name",function(){ $("#glm-admin-profile-overlay").fadeIn('fast'); $(this).parent().addClass("glm-admin-active-record"); + $(this).parent().siblings().removeClass("glm-admin-active-record"); localStorage.setItem("active-record", $(this).parent().data("id")); $(".edit-screen-mount").html(''); var editData = {}; -- 2.17.1