Select filtering, multiple filter combination fix in filterData function,

Author: bjorn2404

dist/categories-example.html

@@ -72,6 +72,19 @@ <h1>Using Chipotle as an Example</h1>
 						</label>
 					</li>
 				</ul>
+
+				<ul id="city-filter" class="bh-storelocator-filters">
+					<li><h3>City</h3></li>
+					<li>
+						<select name="city">
+							<option value="">All cities</option>
+							<option value="Minneapolis">Minneapolis</option>
+							<option value="Bloomington">Bloomington</option>
+							<option value="Golden Valley">Golden Valley</option>
+							<option value="St. Louis Park">St. Louis Park</option>
+						</select>
+					</li>
+				</ul>
 			</div>
 		</form>
 
@@ -93,6 +106,7 @@ <h1>Using Chipotle as an Example</h1>
 	$(function() {
 		$('.bh-storelocator-map-container').storeLocator({
 			'taxonomyFilters' : {
+				'city' : 'city-filter',
 				'category' : 'category-filters-container1',
 				'features' : 'category-filters-container2'
 			}

dist/js/jquery.storelocator.js

@@ -1,4 +1,4 @@
-/*! jQuery Google Maps Store Locator - v1.4.9 - 2014-06-22
+/*! jQuery Google Maps Store Locator - v1.4.9 - 2014-06-29
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
 * Copyright (c) 2014 Bjorn Holine; Licensed MIT */
 
@@ -220,20 +220,47 @@ $.fn.storeLocator = function(options){
 	 */
 	function checkFilters(){
 		$.each(settings.taxonomyFilters,function(k, v){
-			//Find the existing checked boxes for each filter
+			//Find the existing checked boxes for each checkbox filter
 			$(v + ' input[type=checkbox]').each(function(){
 				if($(this).prop('checked')){
-					var catVal = $(this).attr('id');
+					var filterVal = $(this).attr('id');
 
 					//Only add the taxonomy id if it doesn't already exist
-					if(filters[k].indexOf(catVal) === -1){
-						filters[k].push(catVal);
+					if(filters[k].indexOf(filterVal) === -1){
+						filters[k].push(filterVal);
 					}
 				}
 			});
+
+			//Find the existing selected value for each select filter
+			$(v + ' select').each(function(){
+				var filterVal = $(this).attr('id');
+
+				//Only add the taxonomy id if it doesn't already exist
+				if(filters[k].indexOf(filterVal) === -1){
+					filters[k].push(filterVal);
+				}
+			});
 		});
 	}
 
+	/**
+	 * Get the filter key from the taxonomyFilter setting
+	 *
+	 * @param filterContainer {string} ID of the changed filter's container
+	 */
+	function getFilterKey(filterContainer){
+		for(var key in settings.taxonomyFilters){
+			if(settings.taxonomyFilters.hasOwnProperty(key)){
+				for(var i = 0; i< settings.taxonomyFilters[key].length; i++){
+					if(settings.taxonomyFilters[key] === filterContainer){
+						return key;
+					}
+				}
+			}
+		}
+	}
+
 	//Taxonomy filtering
 	if(settings.taxonomyFilters !== null){
 
@@ -243,72 +270,100 @@ $.fn.storeLocator = function(options){
 		});
 
 		//Handle filter updates
-		$('.bh-storelocator-filters-container').on('change.'+prefix, 'input', function(e){
+		$('.bh-storelocator-filters-container').on('change.'+prefix, 'input, select', function(e){
 			e.stopPropagation();
 
-			//First check if it's a checkbox or select drop-down
-			if($(this).is('input[type="checkbox"]')){
-				var catId, locFilterContainer, locFilterKey; //TODO: Change variable loc names to something else
+			var filterId, filterContainer, filterKey;
 
+			//Handle checkbox filters
+			if($(this).is('input[type="checkbox"]')){
 				//First check for existing selections
 				checkFilters();
 
-				catId = $(this).val();
-				locFilterContainer = $(this).closest('ul').attr('id');
+				filterId = $(this).val();
+				filterContainer = $(this).closest('.bh-storelocator-filters').attr('id');
+				filterKey = getFilterKey(filterContainer);
 
-				//Get the correct filter key
-				for(var key in settings.taxonomyFilters){
-					if(settings.taxonomyFilters.hasOwnProperty(key)){
-						for(var i = 0; i< settings.taxonomyFilters[key].length; i++){
-							if(settings.taxonomyFilters[key] === locFilterContainer){
-								locFilterKey = key;
+				if(filterKey){
+					//Add or remove filters based on checkbox values
+					if($(this).prop('checked')){
+						//Add ids to the filter arrays as they are checked
+						filters[filterKey].push(filterId);
+						if($('#'+settings.mapDiv).hasClass('bh-storelocator-map-open') === true){
+							reset();
+							if((olat) && (olng)){
+								settings.mapSettings.zoom = 0;
+								begin_mapping();
+							}
+							else{
+								mapping(originalData);
 							}
 						}
 					}
-				}
-
-				//Add or remove filters based on checkbox values
-				if($(this).prop('checked')){
-					//Add ids to the filter arrays as they are checked
-					filters[locFilterKey].push(catId);
-					if($('#'+settings.mapDiv).hasClass('bh-storelocator-map-open') === true){
-						reset();
-						if((olat) && (olng)){
-							settings.mapSettings.zoom = 0;
-							begin_mapping();
-						}
-						else{
-							mapping(originalData);
+					else {
+						//Remove ids from the filter arrays as they are unchecked
+						var filterIndex = filters[filterKey].indexOf(filterId);
+						if(filterIndex > -1){
+							filters[filterKey].splice(filterIndex, 1);
+							if($('#'+settings.mapDiv).hasClass('bh-storelocator-map-open') === true){
+								reset();
+								if((olat) && (olng)){
+									if(countFilters() === 0){
+										settings.mapSettings.zoom = originalZoom;
+									}
+									else{
+										settings.mapSettings.zoom = 0;
+									}
+									begin_mapping();
+								}
+								else {
+									mapping(originalData);
+								}
+							}
 						}
 					}
 				}
-				else {
-					//Remove ids from the filter arrays as they are unchecked
-					var filterIndex = filters[locFilterKey].indexOf(catId);
-					if(filterIndex > -1){
-						filters[locFilterKey].splice(filterIndex, 1);
+			}
+			//Handle select filters
+			else if($(this).is('select')){
+				//First check for existing selections
+				checkFilters();
+
+				filterId = $(this).val();
+				filterContainer = $(this).closest('.bh-storelocator-filters').attr('id');
+				filterKey = getFilterKey(filterContainer);
+
+				//Check for blank filter on select since default val could be empty
+				if(filterId){
+					if(filterKey){
+						filters[filterKey] = [filterId];
 						if($('#'+settings.mapDiv).hasClass('bh-storelocator-map-open') === true){
 							reset();
 							if((olat) && (olng)){
-								if(countFilters() === 0){
-									settings.mapSettings.zoom = originalZoom;
-								}
-								else{
-									settings.mapSettings.zoom = 0;
-								}
+								settings.mapSettings.zoom = 0;
 								begin_mapping();
 							}
-							else {
+							else{
 								mapping(originalData);
 							}
 						}
 					}
 				}
+				//Reset if the default option is selected
+				else{
+					if(filterKey){
+						filters[filterKey] = [];
+					}
+					reset();
+					if((olat) && (olng)){
+						settings.mapSettings.zoom = originalZoom;
+						begin_mapping();
+					}
+					else{
+						mapping(originalData);
+					}
+				}
 			}
-			//Select filters
-		/*else {
-
-			}*/
 		});
 	}
 
@@ -721,15 +776,18 @@ $.fn.storeLocator = function(options){
               });
             }
 
-					function filterData(data, filters) {
+					function filterData(data, filters){
+						var filterTest = true;
+
 						for (var k in filters) {
 							if (!(new RegExp(filters[k].join("")).test(data[k]))){
-								return false;
-							}
-							else{
-								return true;
+								filterTest = false;
 							}
 						}
+
+						if(filterTest){
+							return true;
+						}
 					}
 
 					//Taxonomy filtering setup