Added exclusiveFiltering and callbackFilters, fixed fullMapStart and inlineDirections combo bug, fixed olat/olng not being set in autoGeocodeQuery method

Author: bjorn2404

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

@@ -1,4 +1,4 @@
-/*! jQuery Google Maps Store Locator - v2.0.5 - 2015-01-04
+/*! jQuery Google Maps Store Locator - v2.0.6 - 2015-03-24
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
 * Copyright (c) 2015 Bjorn Holine; Licensed MIT */
 
@@ -75,6 +75,7 @@
 		'infowindowTemplateID'     : null,
 		'taxonomyFilters'          : null,
 		'taxonomyFiltersContainer' : 'bh-sl-filters-container',
+		'exclusiveFiltering'       : false,
 		'querystringParams'        : false,
 		'callbackNotify'           : null,
 		'callbackBeforeSend'       : null,
@@ -89,6 +90,7 @@
 		'callbackNoResults'        : null,
 		'callbackListClick'        : null,
 		'callbackMarkerClick'      : null,
+		'callbackFilters'          : null,
 		// Language options
 		'addressErrorAlert'        : 'Unable to find address',
 		'autoGeocodeErrorAlert'    : 'Automatic location detection failed. Please fill in your address or zip code.',
@@ -626,8 +628,25 @@
 
 			for (var k in filters) {
 				if (filters.hasOwnProperty(k)) {
-					if (!(new RegExp(filters[k].join(''), 'i').test(data[k]))) {
-						filterTest = false;
+
+					// Exclusive filtering
+					if(this.settings.exclusiveFiltering === true) {
+						var filterTests = filters[k];
+						var exclusiveTest = [];
+
+						for(var l = 0; l < filterTests.length; l++) {
+							exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k]);
+						}
+
+						if(exclusiveTest.indexOf(true) === -1) {
+							filterTest = false;
+						}
+					}
+					// Inclusive filtering
+					else {
+						if (!(new RegExp(filters[k].join(''), 'i').test(data[k]))) {
+							filterTest = false;
+						}
 					}
 				}
 			}
@@ -951,8 +970,8 @@
 			r.geocode({'latLng': latlng}, function (data) {
 				if (data !== null) {
 					var originAddress = data.address;
-					mappingObj.lat = position.coords.latitude;
-					mappingObj.lng = position.coords.longitude;
+					olat = mappingObj.lat = position.coords.latitude;
+					olng = mappingObj.lng = position.coords.longitude;
 					mappingObj.origin = originAddress;
 					_this.mapping(mappingObj);
 				} else {
@@ -1762,7 +1781,7 @@
 				});
 
 				// Inline directions
-				if(_this.settings.inlineDirections === true){
+				if(_this.settings.inlineDirections === true && typeof origin !== 'undefined') {
 					// Open directions
 					$(document).on('click.'+pluginName, '.' + _this.settings.locationList + ' li .loc-directions a', function (e) {
 						e.preventDefault();
@@ -1859,6 +1878,11 @@
 				if (_this.settings.modal === true && _this.settings.callbackModalReady) {
 						_this.settings.callbackModalReady.call(this);
 				}
+
+				// Filters callback
+				if (_this.settings.callbackFilters) {
+					_this.settings.callbackFilters.call(this, filters);
+				}
 
 			});
 		}

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

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Bjorn Holine
+Copyright (c) 2015 Bjorn Holine
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

license.txt

@@ -53,6 +53,7 @@
 | infowindowTemplateID | null | ID of infowindow template if using inline Handlebar templates instead of separate files. |
 | taxonomyFilters | null | Filtering object that can be used to set up live filtering (see categories example). |
 | taxonomyFiltersContainer | 'bh-sl-filters-container' | Class of the container around the filters. |
+| exclusiveFiltering | false | Set to true to enable exclusive taxonomy filtering rather than the default inclusive. |
 | querystringParams | false | Set to true to enable query string support for passing input variables from page to page. |
 | callbackNotify | null | Callback that can override the notify method. |
 | callbackBeforeSend | null | Callback that fires before the AJAX request. |
@@ -67,6 +68,7 @@
 | callbackNoResults | null | Callback that fires when no results are found. |
 | callbackListClick | null | Callback that fires when a list element is clicked in the location list. |
 | callbackMarkerClick | null | Callback that fires when a map marker is clicked. |
+| callbackFilters | null | Callback that fires when a filter is changed. |
 | addressErrorAlert | 'Unable to find address' | Language setting |
 | autoGeocodeErrorAlert | 'Automatic location detection failed. Please fill in your address or zip code.' | Language setting |
 | distanceErrorAlert | 'Unfortunately, our closest location is more than ' | Language setting |

options.md

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

@@ -27,15 +27,22 @@ for even faster loading.
 
 ## Changelog
 
+### Version 2.0.6
+
+* Added the option to filter data exclusively rather than inclusively with the exclusiveFiltering setting.
+* Added callbackFilters that fires when a filter is changed and can return the filter values.
+* Fixed issue with fullMapStart and inlineDirections setting combination.
+* Fixed issue with global olat and olng variables not being set with autoGeocode setting enabled.
+
 ### Version 2.0.5
 
-- Fixed typo with originMarker setup.
-- Made the originMarkerDim setting optional when setting a custom origin marker image - defaults to 32px by 32px.
-- Removed geocodeErrorAlert language option and switched error alerts to custom exceptions so users aren't shown 
+* Fixed typo with originMarker setup.
+* Made the originMarkerDim setting optional when setting a custom origin marker image - defaults to 32px by 32px.
+* Removed geocodeErrorAlert language option and switched error alerts to custom exceptions so users aren't shown
 multiple alerts.
-- Fixed bug with inline directions where close icon wasn't being removed on page reload.
-- Added callbackListClick that fires when a list element is clicked.
-- Added callbackMarkerClick that fires when a map marker is clicked.
+* Fixed bug with inline directions where close icon wasn't being removed on page reload.
+* Added callbackListClick that fires when a list element is clicked.
+* Added callbackMarkerClick that fires when a map marker is clicked.
 
 ### Version 2.0.4
 

readme.md

@@ -73,6 +73,7 @@
 		'infowindowTemplateID'     : null,
 		'taxonomyFilters'          : null,
 		'taxonomyFiltersContainer' : 'bh-sl-filters-container',
+		'exclusiveFiltering'       : false,
 		'querystringParams'        : false,
 		'callbackNotify'           : null,
 		'callbackBeforeSend'       : null,
@@ -87,6 +88,7 @@
 		'callbackNoResults'        : null,
 		'callbackListClick'        : null,
 		'callbackMarkerClick'      : null,
+		'callbackFilters'          : null,
 		// Language options
 		'addressErrorAlert'        : 'Unable to find address',
 		'autoGeocodeErrorAlert'    : 'Automatic location detection failed. Please fill in your address or zip code.',
@@ -624,8 +626,25 @@
 
 			for (var k in filters) {
 				if (filters.hasOwnProperty(k)) {
-					if (!(new RegExp(filters[k].join(''), 'i').test(data[k]))) {
-						filterTest = false;
+
+					// Exclusive filtering
+					if(this.settings.exclusiveFiltering === true) {
+						var filterTests = filters[k];
+						var exclusiveTest = [];
+
+						for(var l = 0; l < filterTests.length; l++) {
+							exclusiveTest[l] = new RegExp(filterTests[l], 'i').test(data[k]);
+						}
+
+						if(exclusiveTest.indexOf(true) === -1) {
+							filterTest = false;
+						}
+					}
+					// Inclusive filtering
+					else {
+						if (!(new RegExp(filters[k].join(''), 'i').test(data[k]))) {
+							filterTest = false;
+						}
 					}
 				}
 			}
@@ -949,8 +968,8 @@
 			r.geocode({'latLng': latlng}, function (data) {
 				if (data !== null) {
 					var originAddress = data.address;
-					mappingObj.lat = position.coords.latitude;
-					mappingObj.lng = position.coords.longitude;
+					olat = mappingObj.lat = position.coords.latitude;
+					olng = mappingObj.lng = position.coords.longitude;
 					mappingObj.origin = originAddress;
 					_this.mapping(mappingObj);
 				} else {
@@ -1760,7 +1779,7 @@
 				});
 
 				// Inline directions
-				if(_this.settings.inlineDirections === true){
+				if(_this.settings.inlineDirections === true && typeof origin !== 'undefined') {
 					// Open directions
 					$(document).on('click.'+pluginName, '.' + _this.settings.locationList + ' li .loc-directions a', function (e) {
 						e.preventDefault();
@@ -1857,6 +1876,11 @@
 				if (_this.settings.modal === true && _this.settings.callbackModalReady) {
 						_this.settings.callbackModalReady.call(this);
 				}
+
+				// Filters callback
+				if (_this.settings.callbackFilters) {
+					_this.settings.callbackFilters.call(this, filters);
+				}
 
 			});
 		}

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", "location", "locations", "maps", "map", "stores", "find"],
-    "version": "2.0.5",
+    "version": "2.0.6",
     "author": {
         "name": "Bjorn Holine",
         "url": "http://www.bjornblog.com/"