Fixed error when filtering with query strings where filter values with spaces wouldn't work, updated processForm method so submitting the map removes focus from any of the form input/select fields instead of just the address input, updated filterData string replace methods to match string replace method in filters setup

bjorn2404 · bjorn2404 · commit 1201e1615316 · 2017-06-11T23:44:23.000-05:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-  "version": "2.7.3",
+  "version": "2.7.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.",
   "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.7.3 - 2017-05-07
+/*! jQuery Google Maps Store Locator - v2.7.4 - 2017-06-11
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
 * Copyright (c) 2017 Bjorn Holine; Licensed MIT */
 
@@ -875,7 +875,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]|[.*+?^=!:${}()|\[\]\/\\])/g, ''));
 							}
 						}
 
@@ -885,7 +885,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]|[.*+?^=!:${}()|\[\]\/\\])/g, '')))) {
 							filterTest = false;
 						}
 					}
@@ -1522,8 +1522,8 @@
 				e.preventDefault();
 			}
 
-			// Blur the input field to hide mobile keyboards.
-			$addressInput.blur();
+			// Blur any form field to hide mobile keyboards.
+			$('.' + _this.settings.formContainer +' input, .' + _this.settings.formContainer + ' select').blur();
 
 			// Query string parameters
 			if(this.settings.querystringParams === true) {
@@ -1770,21 +1770,20 @@
 			if ( $taxGroupContainer.find('input[type="checkbox"]').length ) {
 
 				for ( var i = 0; i < value.length; i++ ) {
-					$taxGroupContainer.find('input:checkbox[value=' + value[i] + ']').prop('checked', true);
+					$taxGroupContainer.find('input:checkbox[value="' + value[i] + '"]').prop('checked', true);
 				}
-
 			}
 
 			// Handle select fields.
 			if ( $taxGroupContainer.find('select').length ) {
 				// Only expecting one value for select fields.
-				$taxGroupContainer.find('option[value=' + value[0] + ']').prop('selected', true);
+				$taxGroupContainer.find('option[value="' + value[0] + '"]').prop('selected', true);
 			}
 
 			// Handle radio buttons.
 			if ( $taxGroupContainer.find('input[type="radio"]').length ) {
 				// Only one value for radio button.
-				$taxGroupContainer.find('input:radio[value=' + value[0] + ']').prop('checked', true);
+				$taxGroupContainer.find('input:radio[value="' + value[0] + '"]').prop('checked', true);
 			}
 		},
 
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.7.3",
+  "version": "2.7.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.",
   "repository": {
     "type": "git",
diff --git a/readme.md b/readme.md
@@ -35,6 +35,12 @@ filtering.
 
 ## Changelog
 
+### Version 2.7.4
+
+* Fixed error when filtering with query strings where filter values with spaces wouldn't work.
+* Updated processForm method so submitting the map removes focus from any of the form input/select fields instead of just the address input.
+* Updated filterData string replace methods to match string replace method in filters setup.
+
 ### Version 2.7.3
 
 * Added ability to indicate multiple query string parameter values (for checkboxes) with a comma separated list value.
diff --git a/src/js/jquery.storelocator.js b/src/js/jquery.storelocator.js
@@ -872,7 +872,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]|[.*+?^=!:${}()|\[\]\/\\])/g, ''));
 							}
 						}
 
@@ -882,7 +882,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]|[.*+?^=!:${}()|\[\]\/\\])/g, '')))) {
 							filterTest = false;
 						}
 					}
@@ -1519,8 +1519,8 @@
 				e.preventDefault();
 			}
 
-			// Blur the input field to hide mobile keyboards.
-			$addressInput.blur();
+			// Blur any form field to hide mobile keyboards.
+			$('.' + _this.settings.formContainer +' input, .' + _this.settings.formContainer + ' select').blur();
 
 			// Query string parameters
 			if(this.settings.querystringParams === true) {
@@ -1767,21 +1767,20 @@
 			if ( $taxGroupContainer.find('input[type="checkbox"]').length ) {
 
 				for ( var i = 0; i < value.length; i++ ) {
-					$taxGroupContainer.find('input:checkbox[value=' + value[i] + ']').prop('checked', true);
+					$taxGroupContainer.find('input:checkbox[value="' + value[i] + '"]').prop('checked', true);
 				}
-
 			}
 
 			// Handle select fields.
 			if ( $taxGroupContainer.find('select').length ) {
 				// Only expecting one value for select fields.
-				$taxGroupContainer.find('option[value=' + value[0] + ']').prop('selected', true);
+				$taxGroupContainer.find('option[value="' + value[0] + '"]').prop('selected', true);
 			}
 
 			// Handle radio buttons.
 			if ( $taxGroupContainer.find('input[type="radio"]').length ) {
 				// Only one value for radio button.
-				$taxGroupContainer.find('input:radio[value=' + value[0] + ']').prop('checked', true);
+				$taxGroupContainer.find('input:radio[value="' + value[0] + '"]').prop('checked', true);
 			}
 		},
 
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.7.3",
+    "version": "2.7.4",
     "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.7.3",`
	`3`	`+ "version": "2.7.4",`
`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",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*! jQuery Google Maps Store Locator - v2.7.3 - 2017-05-07`
	`1`	`+/*! jQuery Google Maps Store Locator - v2.7.4 - 2017-06-11`
`2`	`2`	`* http://www.bjornblog.com/web/jquery-store-locator-plugin`
`3`	`3`	`* Copyright (c) 2017 Bjorn Holine; Licensed MIT */`
`4`	`4`
`@@ -875,7 +875,7 @@`
`875`	`875`
`876`	`876`	`if(typeof data[k] !== 'undefined') {`
`877`	`877`	`for (var l = 0; l < filterTests.length; l++) {`
`878`		`- exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/[^\x00-\x7F]/g, ''));`
	`878`	`+ exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/([^\x00-\x7F]\|[.*+?^=!:${}()\|\[\]\/\\])/g, ''));`
`879`	`879`	`}`
`880`	`880`	`}`
`881`	`881`
`@@ -885,7 +885,7 @@`
`885`	`885`	`}`
`886`	`886`	`// Inclusive filtering`
`887`	`887`	`else {`
`888`		`- if (typeof data[k] === 'undefined' \|\| !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/[^\x00-\x7F]/g, '')))) {`
	`888`	`+ if (typeof data[k] === 'undefined' \|\| !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/([^\x00-\x7F]\|[.*+?^=!:${}()\|\[\]\/\\])/g, '')))) {`
`889`	`889`	`filterTest = false;`
`890`	`890`	`}`
`891`	`891`	`}`
`@@ -1522,8 +1522,8 @@`
`1522`	`1522`	`e.preventDefault();`
`1523`	`1523`	`}`
`1524`	`1524`
`1525`		`- // Blur the input field to hide mobile keyboards.`
`1526`		`- $addressInput.blur();`
	`1525`	`+ // Blur any form field to hide mobile keyboards.`
	`1526`	`+ $('.' + _this.settings.formContainer +' input, .' + _this.settings.formContainer + ' select').blur();`
`1527`	`1527`
`1528`	`1528`	`// Query string parameters`
`1529`	`1529`	`if(this.settings.querystringParams === true) {`
`@@ -1770,21 +1770,20 @@`
`1770`	`1770`	`if ( $taxGroupContainer.find('input[type="checkbox"]').length ) {`
`1771`	`1771`
`1772`	`1772`	`for ( var i = 0; i < value.length; i++ ) {`
`1773`		`- $taxGroupContainer.find('input:checkbox[value=' + value[i] + ']').prop('checked', true);`
	`1773`	`+ $taxGroupContainer.find('input:checkbox[value="' + value[i] + '"]').prop('checked', true);`
`1774`	`1774`	`}`
`1775`		`-`
`1776`	`1775`	`}`
`1777`	`1776`
`1778`	`1777`	`// Handle select fields.`
`1779`	`1778`	`if ( $taxGroupContainer.find('select').length ) {`
`1780`	`1779`	`// Only expecting one value for select fields.`
`1781`		`- $taxGroupContainer.find('option[value=' + value[0] + ']').prop('selected', true);`
	`1780`	`+ $taxGroupContainer.find('option[value="' + value[0] + '"]').prop('selected', true);`
`1782`	`1781`	`}`
`1783`	`1782`
`1784`	`1783`	`// Handle radio buttons.`
`1785`	`1784`	`if ( $taxGroupContainer.find('input[type="radio"]').length ) {`
`1786`	`1785`	`// Only one value for radio button.`
`1787`		`- $taxGroupContainer.find('input:radio[value=' + value[0] + ']').prop('checked', true);`
	`1786`	`+ $taxGroupContainer.find('input:radio[value="' + value[0] + '"]').prop('checked', true);`
`1788`	`1787`	`}`
`1789`	`1788`	`},`
`1790`	`1789`
Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@`
`872`	`872`
`873`	`873`	`if(typeof data[k] !== 'undefined') {`
`874`	`874`	`for (var l = 0; l < filterTests.length; l++) {`
`875`		`- exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/[^\x00-\x7F]/g, ''));`
	`875`	`+ exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k].replace(/([^\x00-\x7F]\|[.*+?^=!:${}()\|\[\]\/\\])/g, ''));`
`876`	`876`	`}`
`877`	`877`	`}`
`878`	`878`
`@@ -882,7 +882,7 @@`
`882`	`882`	`}`
`883`	`883`	`// Inclusive filtering`
`884`	`884`	`else {`
`885`		`- if (typeof data[k] === 'undefined' \|\| !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/[^\x00-\x7F]/g, '')))) {`
	`885`	`+ if (typeof data[k] === 'undefined' \|\| !(new RegExp(filters[k].join(''), 'i').test(data[k].replace(/([^\x00-\x7F]\|[.*+?^=!:${}()\|\[\]\/\\])/g, '')))) {`
`886`	`886`	`filterTest = false;`
`887`	`887`	`}`
`888`	`888`	`}`
`@@ -1519,8 +1519,8 @@`
`1519`	`1519`	`e.preventDefault();`
`1520`	`1520`	`}`
`1521`	`1521`
`1522`		`- // Blur the input field to hide mobile keyboards.`
`1523`		`- $addressInput.blur();`
	`1522`	`+ // Blur any form field to hide mobile keyboards.`
	`1523`	`+ $('.' + _this.settings.formContainer +' input, .' + _this.settings.formContainer + ' select').blur();`
`1524`	`1524`
`1525`	`1525`	`// Query string parameters`
`1526`	`1526`	`if(this.settings.querystringParams === true) {`
`@@ -1767,21 +1767,20 @@`
`1767`	`1767`	`if ( $taxGroupContainer.find('input[type="checkbox"]').length ) {`
`1768`	`1768`
`1769`	`1769`	`for ( var i = 0; i < value.length; i++ ) {`
`1770`		`- $taxGroupContainer.find('input:checkbox[value=' + value[i] + ']').prop('checked', true);`
	`1770`	`+ $taxGroupContainer.find('input:checkbox[value="' + value[i] + '"]').prop('checked', true);`
`1771`	`1771`	`}`
`1772`		`-`
`1773`	`1772`	`}`
`1774`	`1773`
`1775`	`1774`	`// Handle select fields.`
`1776`	`1775`	`if ( $taxGroupContainer.find('select').length ) {`
`1777`	`1776`	`// Only expecting one value for select fields.`
`1778`		`- $taxGroupContainer.find('option[value=' + value[0] + ']').prop('selected', true);`
	`1777`	`+ $taxGroupContainer.find('option[value="' + value[0] + '"]').prop('selected', true);`
`1779`	`1778`	`}`
`1780`	`1779`
`1781`	`1780`	`// Handle radio buttons.`
`1782`	`1781`	`if ( $taxGroupContainer.find('input[type="radio"]').length ) {`
`1783`	`1782`	`// Only one value for radio button.`
`1784`		`- $taxGroupContainer.find('input:radio[value=' + value[0] + ']').prop('checked', true);`
	`1783`	`+ $taxGroupContainer.find('input:radio[value="' + value[0] + '"]').prop('checked', true);`
`1785`	`1784`	`}`
`1786`	`1785`	`},`
`1787`	`1786`