From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 19 Jan 2017 17:30:30 +0000 (-0500)
Subject: Make js calls work in either http or https
X-Git-Tag: v2.9.5^2~11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=73f5de76784f1749dfd7c3cd0d739eec0e4443f8;p=WP-Plugins%2Fglm-member-db.git

Make js calls work in either http or https

This is for making sites fully https in future.
---

diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index cfc350d4..bc25253f 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -1,7 +1,7 @@
 {include file='admin/member/header.html'}
 
 
-    <script src="http://maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
+    <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
     <script type="text/javascript">var enableDraggable = true;</script>
 
     <!--[if lt IE 9]>
diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index 0917462a..f6a1f731 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -16,7 +16,7 @@
             <div id="glm-directionsMap" class="glm-map">(directions load here)</div>
             <div id="directions-panel"></div>
         </div>
-        
+
         <div class="row">
             <div id="glm-directions" class="small-12 columns glm-member-entry-container">
                 <div class="row">
@@ -26,13 +26,13 @@
                             <option value="DRIVING">Driving</option>
                             <option value="WALKING">Walking</option>
                             <option value="BICYCLING">Bicycling</option>
-                             <option value="TRANSIT">Transit Services</option> - Doesn't seem to work 
+                             <option value="TRANSIT">Transit Services</option> - Doesn't seem to work
                         </select>
-                    </div>  
+                    </div>
                     <div class="small-12 medium-8 columns">
                         Enter address to show directions ...
                         <input id="glm-startLocation" type="text" name="startLocation" class="glm-form-text-input" placeholder=""><br>
-                    </div>   
+                    </div>
                 </div>
                 <div class="row">
                     <div style="text-align: center;">
@@ -44,7 +44,7 @@
         </div>-->
     {/if}
 <a id="topAnchor"></a>
-    
+
 <!--    <h3>{$terms.term_member_cap} Detail</h3>-->
     <div class="row">
         <script>//document.write('<a id="glm-member-detail-takeback-mini" class="button glm-member-button" href="' + document.referrer + '"><span>Back to listing</span></a>');</script>
@@ -61,10 +61,10 @@
                     <a id="glm-member-detail-website-link" class="small-12 button glm-button" data-member-id="{$member.member_pointer}" data-member-slug="{$member.member_slug}" href="{$member.url}"{if $settings.detail_show_url_newtarget} target="_blank"{/if}>Visit Website</a>
                     <input type="hidden" id="glm-member-detail-click-logged" value="0">
                 {/if}
-                
+
                 <div id="glm-member-detail-contact-info">
-    <!-- Member name, address, and basic information -->                    
-    
+    <!-- Member name, address, and basic information -->
+
                     {if $settings.detail_show_address}
                         <div class="glm-member-detail-address-wrapper">
                             <small>Address</small>
@@ -81,17 +81,17 @@
                                     {if $member.state.value}
                                         <span>{$member.state.value}</span>
                                     {/if}
-                                    {if $member.zip} 
+                                    {if $member.zip}
                                         {$member.zip}
                                     {/if}
                                 </div>
-                            {/if} 
+                            {/if}
                             {if $member.country.name && $settings.detail_show_country}
                                 <div>{$member.country.name}</div>
                             {/if}
                             {apply_filters('glm-member-db-front-members-detail-addressBottom', '', $member.id)}
                         </div>
-                    {/if}        
+                    {/if}
                     {apply_filters('glm-member-db-front-members-detail-otherDetailTop', '', $member.id)}
                     {if $member.region && $settings.detail_show_region}
                         <div>
@@ -124,20 +124,20 @@
                         {/if}
                         {apply_filters('glm-member-db-front-members-detail-linksBottom', '', $member.id)}
                     </div>
-    
+
                     <div class="glm-member-db-socials">
                         {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.id)}
                         {apply_filters('glm-member-db-front-members-social-list', '', $member.id)}
                     </div>
                 </div>
-                
+
                 {if $settings.detail_show_map}
-                <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
+                <script src="//maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
                 <div id="glm-locationMap-container">
                     <div id="glm-locationMap" class="glm-map small-12 columns">(map loads here)</div>
                 </div>
                 <div id="glm-member-detail-map-button" class="button map-button">view map</div>
-                
+
                     <div id="member-lat" rel="{$member.lat}"></div>
                     <div id="member-lon" rel="{$member.lon}"></div>
                     <form id="MemberDrivingDirectionsForm" name="MemberDrivingDirectionsForm" method="post" action="">
@@ -146,11 +146,11 @@
                         <input type="hidden" id="MemberLon" name="MemberLon" value="{$member.lon}">
                         <input type="submit" class="button map-button text-center" id="MemberDrivingDirectionSubmit" name="MemberDrivingDirectionSubmit" value="Directions">
                     </form>
-                
+
                 {/if}
             </div>
 
-            
+
 <!-- Attributes: amenitities, credit cards, etc -->
             <div id="glm-member-detail-descr-row" class="small-12 medium-8 columns">
                 {apply_filters('glm-member-db-front-members-detail-attributesTop', '', $member.id)}
@@ -205,7 +205,7 @@
                             <a class="glm-member-detail-content-toggle">Collapse</a>
                             <a class="glm-member-detail-link-to-top">Back to top</a>
                         </div>
-                    </div>    
+                    </div>
                     {/if}
                     {apply_filters('glm-member-db-front-members-detail-imageGalleryAfter', '', $member.id)}
                     {apply_filters('glm-member-db-front-members-detail-couponsBefore', '', $member.id)}
@@ -258,7 +258,7 @@
                     </div>
                     {/if}
                     {apply_filters('glm-member-db-front-members-detail-creditcardsAfter', '', $member.id)}
--->                    
+-->
                     {apply_filters('glm-member-db-front-members-detail-categoriesBefore', '', $member.id)}
                     {if $member.categories && $settings.detail_show_categories}
                     <div id="glm-member-detail-categories-toggle" class="glm-member-detail-content-toggle">Categories</div>
@@ -295,9 +295,9 @@
                         </div>
                     </div>
                     {/if}
-                    
+
                     {apply_filters('glm-member-db-front-members-detail-videoAfter', '', $member.id)}
-              
+
                     {apply_filters('glm-member-db-front-members-detail-liveCamBefore', '', $member.id)}
                     {if $member.live_cam_type.value!=1 && $member.live_cam_url && $settings.detail_show_live_cam}
                     <div id="glm-member-detail-live-cam-toggle" class="glm-member-detail-content-toggle">{$terms.term_webcam_cap}</div>
@@ -315,9 +315,9 @@
                         </div>
                     </div>
                     {/if}
-                    
+
                     {apply_filters('glm-member-db-front-members-detail-liveCamAfter', '', $member.id)}
-                    
+
                     {apply_filters('glm-member-db-front-members-detail-dataBottom','',$member.id)}
                 </div>
             </div>
@@ -327,28 +327,28 @@
         </div>
     </div>
     {apply_filters('glm-member-db-front-members-detail-pageBottom', '', $member.id)}
-    
+
     <script type="text/javascript">
         {apply_filters('glm-member-db-front-members-detail-jqueryScriptTop', '', $member.id)}
-        
+
         jQuery(document).ready(function($) {
 
-            // change the member detail photos grid structure depending 
+            // change the member detail photos grid structure depending
             var images_container = $("#glm-member-detail-images-container");
             var foundation_version = window.Foundation.version;
-            
+
             if( foundation_version.charAt(0) === "6" ){
                 images_container.children('ul').removeClass('small-block-grid-1 medium-block-grid-2 large-block-grid-3');
                 images_container.children('ul').addClass('row small-up-1 medium-up-2 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();
 
@@ -356,30 +356,30 @@
             if(window.performance && (performance.navigation.type  == 1 || performance.navigation.type  == 2)) {
                 isRefresh = 1;
             }
-            
+
             // If this is not a refresh or reload, send AJAX action to record click.
             if (isRefresh == 0) {
                 $.ajax({
                    url: "{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=memberDetailClick&memberId={$member.member_pointer}&memberSlug={$member.member_slug}"
                 });
-                $("#glm-member-detail-click-logged").val(1); 
+                $("#glm-member-detail-click-logged").val(1);
             }
 
             // Processes click-through counts for website links
             $('#glm-member-detail-website-link').on('click', function() {
-    
+
                 // Get member ID
                 var memberId = $(this).attr('data-member-id');
                 var memberSlug = $(this).attr('data-member-slug');
-                
+
                 // Send AJAX action to record click.
                 $.ajax({
                    url: "{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=memberClickThrough&memberId=" + memberId + "&memberSlug=" + memberSlug
                 });
-    
+
             });
-            
-            // Automatically zoom and expand the relevant 
+
+            // Automatically zoom and expand the relevant
             $('html').addClass('glmassociatememberdetail glmassociatetop');
             if ("{$expanded}" != "") {
                 var expandTarget = "glm-member-detail-{$expanded}";
@@ -392,9 +392,9 @@
                     }, 500);
                 }
             }
-            
+
             $("a.glm-member-detail-images-thumb").fancybox({
-    
+
                  helpers: {
                     overlay: { locked: false },
                      title: { type: 'inside'},
@@ -403,17 +403,17 @@
                     this.title = $(this.element).find('img').attr('alt');
                 }
             });
-            
+
             $("a.glm-member-detail-images-thumb").click(function(e) {
                 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);
@@ -425,8 +425,8 @@
                     scrollTop: $("#"+target+"-toggle").offset().top-{$settings.detail_top_offset_autoscroll}
                 }, 500);
             });
-            
-            
+
+
             // Open or close the appropriate section if a toggle is clicked
             $(".glm-member-detail-content-toggle").not("#glm-member-detail-fullprofile-toggle").click(function() {
                 if($(this).parents('.glm-member-detail-sub-data-links').length) {
@@ -438,7 +438,7 @@
                 $("#"+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-data-container > .glm-member-detail-content-toggle.selected").length == $("#glm-member-detail-data-container > .glm-member-detail-content-toggle").length) {
@@ -447,7 +447,7 @@
                     $("#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")) {
@@ -460,7 +460,7 @@
                     $(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");
@@ -472,10 +472,10 @@
                     $('#glm-member-detail-takeback-mini span').html("Loading ." + dots);
                   }, 500);
             });
-      
-        
+
+
     {if $settings.detail_show_map}
-    
+
             // Expand/contract map container and change the toggle button
             $("#glm-member-detail-map-button").click(function() {
                 var mapC = "#glm-locationMap-container";
@@ -496,36 +496,36 @@
                 });
                 $(this).html(mapBtnTxt);
             });
-            
+
             /*
              * Google Maps
              *  API reference: https://developers.google.com/maps/documentation/javascript/reference
              */
-             
+
             var myLocation = false;
           {if $member.lat != 0 && $member.lon != 0}
             var memberlocation = new google.maps.LatLng({$member.lat}, {$member.lon});
           {else}
             var memberlocation = new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon});
           {/if}
-            
+
             function initMap() {
-                
+
                 // Set default - Need to make this configurable
                 var map = new google.maps.Map(document.getElementById('glm-locationMap'), {
                 	zoom: {$settings.maps_default_zoom},
                 	center: memberlocation,
-                    disableDefaultUI: false,   
-                    mapTypeId: google.maps.MapTypeId.MAP,  
-                });  
-    
+                    disableDefaultUI: false,
+                    mapTypeId: google.maps.MapTypeId.MAP,
+                });
+
                 // Create a marker for this member
              {if $member.lat != 0 && $member.lon != 0}
-                var marker = new google.maps.Marker({  
-                    map: map,  
+                var marker = new google.maps.Marker({
+                    map: map,
                     position: new google.maps.LatLng({$member.lat}, {$member.lon}),
                     draggable: false,
-                    animation: google.maps.Animation.DROP,  
+                    animation: google.maps.Animation.DROP,
                     title: '{$member.member|escape}'
                 });
              {/if}
@@ -540,11 +540,11 @@
                         //null, /* anchor is bottom center of the scaled image */
                         //new google.maps.Size(30, 30)
                     //);
-                    //var myMarker = new google.maps.Marker({  
-                        //map: map,  
+                    //var myMarker = new google.maps.Marker({
+                        //map: map,
                         //position: myLocation,
                         //draggable: false,
-                        //animation: google.maps.Animation.DROP,  
+                        //animation: google.maps.Animation.DROP,
                         //title: 'My Location',
                         //icon: pinIcon,
                         //zIndex: 100
@@ -552,25 +552,25 @@
                     //$('#glm-startLocation').attr('placeholder', 'Leave blank for your current location or enter address here.');
                   //});
                 //}
-                
+
             }
-            
+
             // Load map
             google.maps.event.addDomListener(window, 'load', initMap);
-            
-            
+
+
     {/if} {*detail_show_map*}
 
 //    Direction code is below, but since we're sending them offsite to google maps this is no longer necessary.
-//    
+//
 //    {if $settings.detail_show_directions}
-//    
+//
 //            var directionsDisplay;
 //            var directionsService = new google.maps.DirectionsService();
 //
 //            // Display map with route from specified location to member location
 //            function calcRoute() {
-//            	
+//
 //            	// If an address was input, use that, otherwise use detected location if available
 //            	var start = $('#glm-startLocation').val();
 //                if (start == '' ) {
@@ -578,7 +578,7 @@
 //                		start = myLocation;
 //                	}
 //                }
-//                
+//
 //                // If no start location available, tell user
 //                if (start == '') {
 //                	alert('No starting location. Please enter address.');
@@ -589,7 +589,7 @@
 //                $('#glm-directionsMap-container').removeClass('glm-hidden');
 //                $('#glm-locationMap-container').addClass('glm-hidden');
 //                $('#glm-showLocationButton').removeClass('glm-hidden');
-//                
+//
 //                // Initialize the directions map with a default center location
 //                directionsDisplay = new google.maps.DirectionsRenderer();
 //                var mapOptions = {
@@ -601,7 +601,7 @@
 //
 //                // Get directions type selected
 //                var directionsType = $('#directionsType').find(':selected').val();
-//                
+//
 //                // Specify origin and destination then get route
 //                var request = {
 //                	origin: start,
@@ -615,7 +615,7 @@
 //                        directionsDisplay.setPanel(document.getElementById('directions-panel'));
 //                    }
 //                });
-//                
+//
 //                // Check for first map idle (completely loaded) - Check max initial zoom
 //                var mapLoadedListener = google.maps.event.addListener(directionsMap, 'idle', function() {
 //                    if (directionsMap.getZoom() > 16) {
@@ -625,7 +625,7 @@
 //                });
 //
 //            }
-//    	
+//
 //            // Trigger route map either by button or input of address
 //            $('#glm-showDirectionsButton' ).click( function() {
 //                calcRoute();
@@ -633,24 +633,24 @@
 //            $('#glm-startLocation' ).change( function() {
 //                calcRoute();
 //            });
-//        		   
+//
 //            // Switch back to member location map
 //        	$('#glm-showLocationButton').click( function() {
-//                $('#glm-directionsMap-container').addClass('glm-hidden');          
+//                $('#glm-directionsMap-container').addClass('glm-hidden');
 //                $('#glm-locationMap-container').removeClass('glm-hidden');
 //                $('#glm-showLocationButton').addClass('glm-hidden');
 //        	});
-//        	
-//    {/if} {*detail_show_directions*}	
+//
+//    {/if} {*detail_show_directions*}
 
         }); // jquery
 
         {apply_filters('glm-member-db-front-members-detail-jqueryScriptBottom', '', $member.id)}
 
 
-        
+
     </script>
-  
+
 {else}
         <p>For some reason the specified {$terms.term_member} was not found. Please try again.</p>
 {/if}
diff --git a/views/front/members/list.html b/views/front/members/list.html
index aa02a74c..407704c6 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -81,7 +81,7 @@
         </div> <!-- glm-member-list-wrapper -->
         {/if} {*list_show_search*}
     {if $settings.list_show_map}
-        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
+        <script src="//maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
         {apply_filters('glm-member-db-front-members-list-mapTop', '')}
         <div id="glm-locationMap-container">
             <div id="glm-locationMap" class="glm-map">(map loads here)</div>
@@ -285,7 +285,7 @@
                     {if $member.logo && $settings.list_show_logo}
                         <div class="glm-member-list-image-wrapper right small-12 medium-4 columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
                             <div class="glm-member-list-image-border">
-                                
+
                                 {if $member.featured}
                                 <div class="glm-member-list-featured-tag">
                                     featured
@@ -361,7 +361,7 @@
                     <div>
                     {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
                     {if $member.short_descr && $settings.list_show_short_descr}
-                        {$member.short_descr|nl2br} 
+                        {$member.short_descr|nl2br}
                         {if $settings.list_show_detail_link}
                             <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">More</a>
                         {/if}