Fixed issue with filtering values containing ampersands, which would not display any results

Author: bjorn2404

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

@@ -881,7 +881,7 @@
 
 						if(typeof data[k] !== 'undefined') {
 							for (var l = 0; l < filterTests.length; l++) {
-								exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\])/g, ''));
+								exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\]|&\s+)/g, ''));
 							}
 						}
 
@@ -891,7 +891,7 @@
 					}
 					// Inclusive filtering
 					else {
-						if (typeof data[k] === 'undefined' || !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\])/g, '')))) {
+						if (typeof data[k] === 'undefined' || !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\]|&\s+)/g, '')))) {
 							filterTest = false;
 						}
 					}
@@ -2474,7 +2474,7 @@
 							if (!taxFilters[k]) {
 								taxFilters[k] = [];
 							}
-							taxFilters[k][z] = '(?=.*\\b' + filters[k][z].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\])/g, '') + '\\b)';
+							taxFilters[k][z] = '(?=.*\\b' + filters[k][z].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\]|&\s+)/g, '') + '\\b)';
 						}
 					}
 				}
@@ -2533,17 +2533,17 @@
 				$this.slideDown();
 			}
 
+			// Output page numbers if pagination setting is true
+			if (_this.settings.pagination === true) {
+				_this.paginationSetup(page);
+			}
+
 			// Handle no results
 			if (_this.isEmptyObject(locationset) || locationset[0].result === 'none') {
 				_this.emptyResult();
 				return;
 			}
 
-			// Output page numbers if pagination setting is true
-			if (_this.settings.pagination === true) {
-				_this.paginationSetup(page);
-			}
-
 			// Set up the modal window
 			_this.modalWindow();
 

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

@@ -58,6 +58,11 @@ <h1 class="bh-sl-title">Using Chipotle as an Example</h1>
 							<input type="checkbox" name="category" value="Coffee"> Coffee
 						</label>
 					</li>
+					<li>
+						<label>
+							<input type="checkbox" name="category" value="Something & Sons"> Something & Sons
+						</label>
+					</li>
 				</ul>
 
 				<ul id="category-filters-container2" class="bh-sl-filters">

dist/categories-example.html

@@ -61,7 +61,7 @@
     "name": "Chipotle Golden Valley",
     "lat": "44.983935",
     "lng": "-93.380542",
-    "category": "Restaurant",
+    "category": "Restaurant, Something & Sons",
     "address": "515 Winnetka Ave. N",
     "address2": "",
     "city": "Golden Valley",

dist/data/locations.json

@@ -40,7 +40,9 @@ filtering.
 * Added callbackAutoGeoSuccess callback that fires after the geolocation API returns a successful result.
 * Added callbackFormVals callback that fires after the form values have been processed from the form.
 * Fixed issue with featuredLocations setting where featured locations at far distances would trigger distance alert.
+* Fixed issue with filtering values containing ampersands, which would not display any results - updated filtering regex.
 * Fixed issue where HTML5 Geolocation was skipped when using the fullMapStartBlank setting.
+* Fixed issue with pagination page numbers displaying after no results via PR from [heldr88](https://github.com/heldr88)
 * Fixed issue with taxonomy filtering and autoGeocode setting where HTML Geocoding API would run on every filter change.
 * Swapped the default location data type to be JSON instead of XML.
 

readme.md

@@ -877,7 +877,7 @@
 
 						if(typeof data[k] !== 'undefined') {
 							for (var l = 0; l < filterTests.length; l++) {
-								exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\])/g, ''));
+								exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\]|&\s+)/g, ''));
 							}
 						}
 
@@ -887,7 +887,7 @@
 					}
 					// Inclusive filtering
 					else {
-						if (typeof data[k] === 'undefined' || !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\])/g, '')))) {
+						if (typeof data[k] === 'undefined' || !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\]|&\s+)/g, '')))) {
 							filterTest = false;
 						}
 					}
@@ -2470,7 +2470,7 @@
 							if (!taxFilters[k]) {
 								taxFilters[k] = [];
 							}
-							taxFilters[k][z] = '(?=.*\\b' + filters[k][z].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\])/g, '') + '\\b)';
+							taxFilters[k][z] = '(?=.*\\b' + filters[k][z].replace(/([^\x00-\x7F]|[.*+?^=!:${}()|\[\]\/\\]|&\s+)/g, '') + '\\b)';
 						}
 					}
 				}
@@ -2539,7 +2539,7 @@
 				_this.emptyResult();
 				return;
 			}
-			
+
 			// Set up the modal window
 			_this.modalWindow();