From f14c536db9004b6f7d561729114ca07857ef4297 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Thu, 12 Sep 2019 16:50:59 -0400 Subject: [PATCH] Fixing the map toggling bug on member detail pages --- glm-member-db/views/front/members/detail.html | 102 +----------------- 1 file changed, 4 insertions(+), 98 deletions(-) diff --git a/glm-member-db/views/front/members/detail.html b/glm-member-db/views/front/members/detail.html index 92e33cb..bb6f613 100755 --- a/glm-member-db/views/front/members/detail.html +++ b/glm-member-db/views/front/members/detail.html @@ -452,25 +452,6 @@ return v; } - // change the member detail photos grid structure depending - var images_container = $("#glm-member-detail-images-container"); - // Check if Foundation exists first -// if ( typeof window.Foundation != 'undefined' ) { -// var foundation_version = window.Foundation.version; -// -// if( foundation_version.charAt(0) === "6" ){ -// images_container.children('ul').removeClass('small-block-grid-1 glma-medium-block-grid-2 glma-large-block-grid-3'); -// images_container.children('ul').addClass('row glma-small-up-1 glma-medium-up-2 glma-large-up-3'); -// images_container.children('ul').find('li').addClass('column'); -// } -// } - - // Replace all non-number special characters in a phone number with the designated infix - {if $settings.phone_infix} - //var processedPhone = $('.glm-member-detail-contact-phone .glm-field-value').text().trim().replace(/[^a-zA-Z0-9 ]/g, '{$settings.phone_infix}'); - //$('.glm-member-detail-contact-phone .glm-field-value').text(processedPhone); - {/if} - // Check a hidden field to see if this is a page refresh (doesn't detect forced reload) var isRefresh = $("#glm-member-detail-click-logged").val(); @@ -509,7 +490,6 @@ //$("#"+expandTarget+"-container").show("fast", "swing", function() {}); $("#"+expandTarget+"-container").addClass("selected"); $("#"+expandTarget+"-toggle").addClass("selected"); - fullProfileCheck(expandTarget); $('html, body').animate({ scrollTop: $("#"+expandTarget+"-toggle").offset().top-10 }, 500); @@ -531,98 +511,24 @@ e.preventDefault(); }); - $('.glm-member-detail-link-to-top').click(function () { - $('body,html').animate({ - scrollTop: $("#glm-member-detail-takeback-mini").offset().top-10 - }, 75); - }); - - // Open the appropriate section if a link is clicked - $('.link-open-detail-content-data').click(function(e) { - var target = $(this).attr("id").slice(0, -5); - // e.g.: #glm-member-detail-packages-link - //$("#"+target+"-container").show("fast", "swing", function() {}); - $("#"+target+"-container").addClass("selected"); - $("#"+target+"-toggle").addClass("selected"); - fullProfileCheck(target); - $('html, body').animate({ - scrollTop: $("#"+target+"-toggle").offset().top-{$settings.detail_top_offset_autoscroll} - }, 500); - }); - - // Auto-expand data sections in small view - {if $settings.detail_auto_expand_sections} - if ( $(window).width() >= 1024 ) { - // Expand all data sections by default - $("#glm-member-detail-toggle-container > .glm-member-detail-content-toggle").toggleClass("selected"); - //$("#glm-member-detail-data-container > .glm-member-detail-content-data").slideToggle("fast", "swing", function() {}); - $("#glm-member-detail-data-container > .glm-member-detail-content-data").toggleClass("selected"); - } - {/if} - // Open or close the appropriate section if a toggle is clicked - $(".glm-member-detail-content-toggle").not("#glm-member-detail-fullprofile-toggle").click(function() { - console.log("Clicked"); + $(".glm-member-detail-content-toggle").click(function() { if($(this).parents('.glm-member-detail-sub-data-links').length) { var target = $(this).parent().parent().attr("id").slice(0, -10); } else { var target = $(this).attr("id").slice(0, -7); } - //$("#"+target+"-container").slideToggle("fast", "swing", function() {}); $("#"+target+"-container").siblings(".selected").removeClass("selected"); $("#"+target+"-toggle").siblings(".selected").removeClass("selected"); + console.log(target); if (target != "glm-member-detail-locationMap") { $("#glm-member-detail-locationMap-container").height(0); - console.log("Didn't click on map"); + console.log("not clicking map"); } $("#"+target+"-container").toggleClass("selected"); $("#"+target+"-toggle").toggleClass("selected"); - fullProfileCheck(target); - }); - - // Change the toggle button based on whether all the content sections are expanded - function fullProfileCheck(target) { - if ($("#glm-member-detail-toggle-container > .glm-member-detail-content-toggle.selected").length == $("#glm-member-detail-toggle-container > .glm-member-detail-content-toggle").length) { - $("#glm-member-detail-fullprofile-toggle").addClass("selected"); - } else { - $("#glm-member-detail-fullprofile-toggle").removeClass("selected"); - } - } - - // Open or close every data container if the fullprofile toggle is clicked - $("#glm-member-detail-fullprofile-toggle").click(function() { - if ($(this).hasClass("selected")) { - //$(".glm-member-detail-content-data").slideUp(175, "swing", function() {}); - $(".glm-member-detail-content-data").removeClass("selected"); - $(".glm-member-detail-content-toggle").removeClass("selected"); - $(this).toggleClass("selected"); - } else { - //$(".glm-member-detail-content-data").not($(this)).slideDown(350, "swing", function() {}); - $(".glm-member-detail-content-data").addClass("selected"); - $(".glm-member-detail-content-toggle").addClass("selected"); - $(this).toggleClass("selected"); - } }); - // Expand the takeback button on hover. Progressively add ellipses when clicked and loading - $("#glm-member-detail-takeback-mini").click(function() { - $("#glm-member-detail-takeback-mini span").html("Loading"); - $("#glm-member-detail-takeback-mini").css('min-width','170px'); - var count = 0; - setInterval(function(){ - count++; - var dots = new Array(count % 5).join(' .'); - $('#glm-member-detail-takeback-mini span').html("Loading ." + dots); - }, 500); - }); - - // Expand the takeback button in small views. - if ( $(window).width() < 1024 ) { - $("#glm-member-detail-takeback-mini").css('width','190px'); - $("#glm-member-detail-takeback-mini span").css('opacity','1'); - } - - {if $settings.detail_show_map} // Expand/contract map container and change the toggle button @@ -632,7 +538,7 @@ var mapNewH = 0; var mapOverflow = 'hidden'; var mapBtnTxt = 'map'; - if ($(mapC).height() == 0) { + if ($(mapC).height() < 600) { mapNewH = 600; mapV = 'visible'; mapBtnTxt = 'map' -- 2.17.1