Fixed empty name search field value overriding filter results, Fixed groups of filters not applying together

Author: bjorn2404

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "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",

dist/assets/js/plugins/storeLocator/jquery.storelocator.js

@@ -1,4 +1,4 @@
-/*! jQuery Google Maps Store Locator - v3.1.2 - 2021-03-27
+/*! jQuery Google Maps Store Locator - v3.1.3 - 2021-05-02
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
 * Copyright (c) 2021 Bjorn Holine; Licensed MIT */
 
@@ -1010,19 +1010,27 @@
 		 * @returns {boolean}
 		 */
 		filterData: function (data, filters) {
-			this.writeDebug('filterData',arguments);
-			var filterTest = false;
+			this.writeDebug('filterData', arguments);
+			var filterTest = true;
 
 			for (var k in filters) {
 				if (filters.hasOwnProperty(k)) {
+					var testResults = [];
 
-					// Exclusive filtering
-					if (this.settings.exclusiveFiltering === true || (this.settings.exclusiveTax !== null && Array.isArray(this.settings.exclusiveTax) && this.settings.exclusiveTax.indexOf(k) !== -1)) {
-						filterTest = this.filterMatching(filters[k], data[k], false );
+					for (var l = 0; l < filters[k].length; l++) {
+
+						// Exclusive filtering
+						if (this.settings.exclusiveFiltering === true || (this.settings.exclusiveTax !== null && Array.isArray(this.settings.exclusiveTax) && this.settings.exclusiveTax.indexOf(k) !== -1)) {
+							testResults[l] = this.filterMatching(filters[k], data[k], false);
+						}
+						// Inclusive filtering
+						else {
+							testResults[l] = this.filterMatching(filters[k], data[k]);
+						}
 					}
-					// Inclusive filtering
-					else {
-						filterTest = this.filterMatching(filters[k], data[k]);
+
+					if (testResults.indexOf(true) === -1) {
+						filterTest = false;
 					}
 				}
 			}
@@ -2812,7 +2820,7 @@
 
 			// Name search - using taxonomy filter to handle
 			if (_this.settings.nameSearch === true) {
-				if (typeof searchInput !== 'undefined') {
+				if (typeof searchInput !== 'undefined' && '' !== searchInput) {
 					filters[_this.settings.nameAttribute] = [searchInput];
 				}
 			}

dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js

@@ -127,7 +127,7 @@ <h1 class="bh-sl-title">Using Chipotle as an Example</h1>
 
 <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
 <script src="assets/js/libs/handlebars.min.js"></script>
-<script src="https://maps.google.com/maps/api/js"></script>
+<script src="https://maps.google.com/maps/api/js?key=AIzaSyAdkGsZ0H4hJpSOLBbrELzmfQEHawLV5Q8"></script>
 <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
 <script>
 	$(function() {

dist/categories-example.html

@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "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",

package.json

@@ -37,6 +37,8 @@ filtering.
 
 ### Version 3.1.3
 
+* Fixed empty name search field value overriding filter results.
+* Fixed groups of filters not applying together.
 * Fixed potential error from occurring if fullMapStartListLimit is set and the number of locations is less than the limit.
 
 ### Version 3.1.2

readme.md

@@ -1006,19 +1006,27 @@
 		 * @returns {boolean}
 		 */
 		filterData: function (data, filters) {
-			this.writeDebug('filterData',arguments);
-			var filterTest = false;
+			this.writeDebug('filterData', arguments);
+			var filterTest = true;
 
 			for (var k in filters) {
 				if (filters.hasOwnProperty(k)) {
+					var testResults = [];
 
-					// Exclusive filtering
-					if (this.settings.exclusiveFiltering === true || (this.settings.exclusiveTax !== null && Array.isArray(this.settings.exclusiveTax) && this.settings.exclusiveTax.indexOf(k) !== -1)) {
-						filterTest = this.filterMatching(filters[k], data[k], false );
+					for (var l = 0; l < filters[k].length; l++) {
+
+						// Exclusive filtering
+						if (this.settings.exclusiveFiltering === true || (this.settings.exclusiveTax !== null && Array.isArray(this.settings.exclusiveTax) && this.settings.exclusiveTax.indexOf(k) !== -1)) {
+							testResults[l] = this.filterMatching(filters[k], data[k], false);
+						}
+						// Inclusive filtering
+						else {
+							testResults[l] = this.filterMatching(filters[k], data[k]);
+						}
 					}
-					// Inclusive filtering
-					else {
-						filterTest = this.filterMatching(filters[k], data[k]);
+
+					if (testResults.indexOf(true) === -1) {
+						filterTest = false;
 					}
 				}
 			}
@@ -2808,7 +2816,7 @@
 
 			// Name search - using taxonomy filter to handle
 			if (_this.settings.nameSearch === true) {
-				if (typeof searchInput !== 'undefined') {
+				if (typeof searchInput !== 'undefined' && '' !== searchInput) {
 					filters[_this.settings.nameAttribute] = [searchInput];
 				}
 			}

src/js/jquery.storelocator.js

@@ -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.2",
+    "version": "3.1.3",
     "author": {
         "name": "Bjorn Holine",
         "url": "http://www.bjornblog.com/"