* Fixed location set length scenario when fullMapStart is enabled and taxFilters is reset and name search and origin are empty.

bjorn2404 · bjorn2404 · commit 2d7a4f3726f6 · 2023-02-02T21:56:47.000-08:00
* Show empty result message if no locations with default sorting.
* Updated deprecated google.maps.event.addDomListener usage with window.addEventListener.
* Update version to v3.1.9
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-  "version": "3.1.8",
+  "version": "3.1.9",
   "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,6 +1,6 @@
-/*! jQuery Google Maps Store Locator - v3.1.8 - 2022-08-21
+/*! jQuery Google Maps Store Locator - v3.1.9 - 2023-02-02
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
-* Copyright (c) 2022 Bjorn Holine; Licensed MIT */
+* Copyright (c) 2023 Bjorn Holine; Licensed MIT */
 
 ;(function ($, window, document, undefined) {
 	'use strict';
@@ -680,7 +680,7 @@
 				_this.map = new google.maps.Map(document.getElementById(_this.settings.mapID), myOptions);
 
 				// Re-center the map when the browser is re-sized
-				google.maps.event.addDomListener(window, 'resize', function() {
+        window.addEventListener('resize', function() {
 					var center = _this.map.getCenter();
 					google.maps.event.trigger(_this.map, 'resize');
 					_this.map.setCenter(center);
@@ -2496,6 +2496,7 @@
 			if (
 				this.settings.openNearest !== true ||
 				typeof nearestLoc === 'undefined' ||
+        typeof originalOrigin === 'undefined' ||
 				(this.settings.fullMapStart === true && firstRun === true && this.settings.querystringParams === false) ||
 				(this.settings.defaultLoc === true && firstRun === true && this.settings.querystringParams === false)
 			) {
@@ -2951,7 +2952,9 @@
 							}
 						}
 						else {
+							_this.emptyResult();
 							throw new Error('No locations found. Please check the dataLocation setting and path.');
+							return;
 						}
 					}
 				}
@@ -3020,6 +3023,16 @@
 				storeNum = _this.settings.storeLimit;
 			}
 
+      // If fullMapStart is enabled and taxFilters is reset and name search and origin are empty, swap back to the original length.
+      if (
+        _this.settings.fullMapStart === true &&
+        _this.isEmptyObject(taxFilters) &&
+        (searchInput === '' || typeof searchInput === 'undefined') &&
+        (addressInput === '' || typeof addressInput === 'undefined')
+      ) {
+        storeNum = locationset.length;
+      }
+
 			// If pagination is on, change the store limit to the setting and slice the locationset array
 			if (_this.settings.pagination === true) {
 				storeNumToShow = _this.settings.locationsPerPage;
@@ -3073,7 +3086,7 @@
 			_this.map = new google.maps.Map(document.getElementById(_this.settings.mapID), myOptions);
 
 			// Re-center the map when the browser is re-sized
-			google.maps.event.addDomListener(window, 'resize', function() {
+      window.addEventListener('resize', function() {
 				var center = _this.map.getCenter();
 				google.maps.event.trigger(_this.map, 'resize');
 				_this.map.setCenter(center);
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": "3.1.8",
+  "version": "3.1.9",
   "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
@@ -35,6 +35,12 @@ filtering.
 
 ## Changelog
 
+### Version 3.1.9
+
+* Fixed location set length scenario when fullMapStart is enabled and taxFilters is reset and name search and origin are empty.
+* Show empty result message if no locations with default sorting.
+* Updated deprecated google.maps.event.addDomListener usage with window.addEventListener.
+
 ### Version 3.1.8
 
 * Added coordinate range check to exclude locations with invalid latitude and longitude values.
diff --git a/src/js/jquery.storelocator.js b/src/js/jquery.storelocator.js
@@ -676,7 +676,7 @@
 				_this.map = new google.maps.Map(document.getElementById(_this.settings.mapID), myOptions);
 
 				// Re-center the map when the browser is re-sized
-				google.maps.event.addDomListener(window, 'resize', function() {
+        window.addEventListener('resize', function() {
 					var center = _this.map.getCenter();
 					google.maps.event.trigger(_this.map, 'resize');
 					_this.map.setCenter(center);
@@ -2492,6 +2492,7 @@
 			if (
 				this.settings.openNearest !== true ||
 				typeof nearestLoc === 'undefined' ||
+        typeof originalOrigin === 'undefined' ||
 				(this.settings.fullMapStart === true && firstRun === true && this.settings.querystringParams === false) ||
 				(this.settings.defaultLoc === true && firstRun === true && this.settings.querystringParams === false)
 			) {
@@ -2947,7 +2948,9 @@
 							}
 						}
 						else {
+							_this.emptyResult();
 							throw new Error('No locations found. Please check the dataLocation setting and path.');
+							return;
 						}
 					}
 				}
@@ -3016,6 +3019,16 @@
 				storeNum = _this.settings.storeLimit;
 			}
 
+      // If fullMapStart is enabled and taxFilters is reset and name search and origin are empty, swap back to the original length.
+      if (
+        _this.settings.fullMapStart === true &&
+        _this.isEmptyObject(taxFilters) &&
+        (searchInput === '' || typeof searchInput === 'undefined') &&
+        (addressInput === '' || typeof addressInput === 'undefined')
+      ) {
+        storeNum = locationset.length;
+      }
+
 			// If pagination is on, change the store limit to the setting and slice the locationset array
 			if (_this.settings.pagination === true) {
 				storeNumToShow = _this.settings.locationsPerPage;
@@ -3069,7 +3082,7 @@
 			_this.map = new google.maps.Map(document.getElementById(_this.settings.mapID), myOptions);
 
 			// Re-center the map when the browser is re-sized
-			google.maps.event.addDomListener(window, 'resize', function() {
+      window.addEventListener('resize', function() {
 				var center = _this.map.getCenter();
 				google.maps.event.trigger(_this.map, 'resize');
 				_this.map.setCenter(center);
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","dealer","location", "locations", "maps", "map", "stores", "find"],
-    "version": "3.1.8",
+    "version": "3.1.9",
     "author": {
         "name": "Bjorn Holine",
         "url": "https://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": "3.1.8",`
	`3`	`+ "version": "3.1.9",`
`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",`