Fixed bug with inline directions panel that occurred after multiple address submissions

bjorn2404 · bjorn2404 · commit 3b5bd77af545 · 2015-09-20T01:27:08.000-05:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "This jQuery plugin takes advantage of Google Maps API version 3 to create an easy to implement store locator. No back-end programming is required, you just need to feed it KML, XML, or JSON data with all the location information.",
   "repository": {
     "type": "git",
diff --git a/dist/assets/js/plugins/storeLocator/jquery.storelocator.js b/dist/assets/js/plugins/storeLocator/jquery.storelocator.js
@@ -1,4 +1,4 @@
-/*! jQuery Google Maps Store Locator - v2.0.9 - 2015-09-19
+/*! jQuery Google Maps Store Locator - v2.0.9 - 2015-09-20
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
 * Copyright (c) 2015 Bjorn Holine; Licensed MIT */
 
@@ -79,7 +79,7 @@
 		'taxonomyFiltersContainer' : 'bh-sl-filters-container',
 		'exclusiveFiltering'       : false,
 		'querystringParams'        : false,
-		'debug'                    : true,
+		'debug'                    : false,
 		'sessionStorage'           : false,
 		'callbackNotify'           : null,
 		'callbackBeforeSend'       : null,
@@ -145,10 +145,8 @@
 				dataTypeRead = this.settings.dataType;
 			}
 
-			// Set up the directionsService if it's true
+			// Add directions panel if enabled
 			if(this.settings.inlineDirections === true) {
-				directionsDisplay = new google.maps.DirectionsRenderer();
-				directionsService = new google.maps.DirectionsService();
 				$('.' + this.settings.locationList).prepend('<div class="bh-sl-directions-panel"></div>');
 			}
 
@@ -238,6 +236,15 @@
 			if( $('.' + this.settings.locationList + ' .bh-sl-close-directions-container').length ) {
 				$('.bh-sl-close-directions-container').remove();
 			}
+			if(this.settings.inlineDirections === true) {
+				// Remove directions panel if it's there
+				var $adp = $('.' + this.settings.locationList + ' .adp');
+				if ( $adp.length > 0 ) {
+					$adp.remove();
+					$('.' + this.settings.locationList + ' ul').fadeIn();
+				}
+				$(document).off('click', '.' + this.settings.locationList + ' li .loc-directions a');
+			}
 		},
 
 		/**
@@ -1150,7 +1157,16 @@
 				$('.' + this.settings.locationList + ' ul').hide();
 				// Remove the markers
 				this.clearMarkers();
+				
+				// Clear the previous directions request
+				if(directionsDisplay !== null && typeof directionsDisplay !== 'undefined') {
+					directionsDisplay.setMap(null);
+					directionsDisplay = null;
+				}
 
+				directionsDisplay = new google.maps.DirectionsRenderer();
+				directionsService = new google.maps.DirectionsService();
+				
 				// Directions request
 				directionsDisplay.setMap(map);
 				directionsDisplay.setPanel($('.bh-sl-directions-panel').get(0));
@@ -1184,11 +1200,8 @@
 			}
 
 			// Remove the close icon, remove the directions, add the list back
-			$('.' + this.settings.locationList + ' .adp').remove();
-			$('.' + this.settings.locationList + ' ul').fadeIn();
-
 			this.reset();
-
+			
 			if ((olat) && (olng)) {
 				if (this.countFilters() === 0) {
 					this.settings.mapSettings.zoom = originalZoom;
diff --git a/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js b/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-	"version": "2.0.9",
+	"version": "2.0.10",
 	"description": "This jQuery plugin takes advantage of Google Maps API version 3 to create an easy to implement store locator. No back-end programming is required, you just need to feed it KML, XML, or JSON data with all the location information.",
 	"repository": {
 		"type": "git",
diff --git a/readme.md b/readme.md
@@ -27,6 +27,16 @@ for even faster loading.
 
 ## Changelog
 
+### Version 2.0.10
+
+Includes contributions from from [Giancarlo Gomez](https://github.com/GiancarloGomez).
+
+* Added ability to pass in array object as dataRaw.
+* Added writeDebug console.log helper function for debugging.
+* Added sessionStorage option to store user's location when autoGeocode in enabled to prevent multiple lookups per session.
+* Fixed bug with inline directions panel that occurred after multiple address submissions.
+* Updated processForm method form field variables with empty string fallback values.
+
 ### Version 2.0.9
 
 * Fixed issue when using catMarkers setting and not setting a location's category resulted in an error.
diff --git a/src/js/jquery.storelocator.js b/src/js/jquery.storelocator.js
@@ -76,7 +76,7 @@
 		'taxonomyFiltersContainer' : 'bh-sl-filters-container',
 		'exclusiveFiltering'       : false,
 		'querystringParams'        : false,
-		'debug'                    : true,
+		'debug'                    : false,
 		'sessionStorage'           : false,
 		'callbackNotify'           : null,
 		'callbackBeforeSend'       : null,
@@ -142,10 +142,8 @@
 				dataTypeRead = this.settings.dataType;
 			}
 
-			// Set up the directionsService if it's true
+			// Add directions panel if enabled
 			if(this.settings.inlineDirections === true) {
-				directionsDisplay = new google.maps.DirectionsRenderer();
-				directionsService = new google.maps.DirectionsService();
 				$('.' + this.settings.locationList).prepend('<div class="bh-sl-directions-panel"></div>');
 			}
 
@@ -235,6 +233,15 @@
 			if( $('.' + this.settings.locationList + ' .bh-sl-close-directions-container').length ) {
 				$('.bh-sl-close-directions-container').remove();
 			}
+			if(this.settings.inlineDirections === true) {
+				// Remove directions panel if it's there
+				var $adp = $('.' + this.settings.locationList + ' .adp');
+				if ( $adp.length > 0 ) {
+					$adp.remove();
+					$('.' + this.settings.locationList + ' ul').fadeIn();
+				}
+				$(document).off('click', '.' + this.settings.locationList + ' li .loc-directions a');
+			}
 		},
 
 		/**
@@ -1147,7 +1154,16 @@
 				$('.' + this.settings.locationList + ' ul').hide();
 				// Remove the markers
 				this.clearMarkers();
+				
+				// Clear the previous directions request
+				if(directionsDisplay !== null && typeof directionsDisplay !== 'undefined') {
+					directionsDisplay.setMap(null);
+					directionsDisplay = null;
+				}
 
+				directionsDisplay = new google.maps.DirectionsRenderer();
+				directionsService = new google.maps.DirectionsService();
+				
 				// Directions request
 				directionsDisplay.setMap(map);
 				directionsDisplay.setPanel($('.bh-sl-directions-panel').get(0));
@@ -1181,11 +1197,8 @@
 			}
 
 			// Remove the close icon, remove the directions, add the list back
-			$('.' + this.settings.locationList + ' .adp').remove();
-			$('.' + this.settings.locationList + ' ul').fadeIn();
-
 			this.reset();
-
+			
 			if ((olat) && (olng)) {
 				if (this.countFilters() === 0) {
 					this.settings.mapSettings.zoom = originalZoom;
diff --git a/storelocator.jquery.json b/storelocator.jquery.json
@@ -3,7 +3,7 @@
     "title": "jQuery Google Maps Store Locator",
     "description": "This jQuery plugin takes advantage of Google Maps API version 3 to create an easy to implement store locator. No back-end programming is required, you just need to feed it KML, XML, or JSON data with all the location information.",
     "keywords": ["jquery","locator","store", "location", "locations", "maps", "map", "stores", "find"],
-    "version": "2.0.9",
+    "version": "2.0.10",
     "author": {
         "name": "Bjorn Holine",
         "url": "http://www.bjornblog.com/"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jquery-storelocator-plugin",`
`3`		`- "version": "2.0.9",`
	`3`	`+ "version": "2.0.10",`
`4`	`4`	`"description": "This jQuery plugin takes advantage of Google Maps API version 3 to create an easy to implement store locator. No back-end programming is required, you just need to feed it KML, XML, or JSON data with all the location information.",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`