Merge branch 'development'

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "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 - v2.0.8 - 2015-07-19
+/*! jQuery Google Maps Store Locator - v2.0.9 - 2015-08-13
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
 * Copyright (c) 2015 Bjorn Holine; Licensed MIT */
 
@@ -798,21 +798,23 @@
 
 			// Custom multi-marker image override (different markers for different categories
 			if(this.settings.catMarkers !== null) {
-				// Multiple categories
-				if(category.indexOf(',') !== -1) {
-					// Break the category variable into an array if there are multiple categories for the location
-					categories = category.split(',');
-					// With multiple categories the color will be determined by the last matched category in the data
-					for(var i = 0; i < categories.length; i++) {
-						if(categories[i] in this.settings.catMarkers) {
-							markerImg = this.markerImage(this.settings.catMarkers[categories[i]][0], this.settings.catMarkers[categories[i]][1], this.settings.catMarkers[categories[i]][2]);
+				if(typeof category !== 'undefined') {
+					// Multiple categories
+					if(category.indexOf(',') !== -1) {
+						// Break the category variable into an array if there are multiple categories for the location
+						categories = category.split(',');
+						// With multiple categories the color will be determined by the last matched category in the data
+						for(var i = 0; i < categories.length; i++) {
+							if(categories[i] in this.settings.catMarkers) {
+								markerImg = this.markerImage(this.settings.catMarkers[categories[i]][0], this.settings.catMarkers[categories[i]][1], this.settings.catMarkers[categories[i]][2]);
+							}
 						}
 					}
-				}
-				// Single category
-				else {
-					if(category in this.settings.catMarkers) {
-						markerImg = this.markerImage(this.settings.catMarkers[category][0], this.settings.catMarkers[category][1], this.settings.catMarkers[category][2]);
+					// Single category
+					else {
+						if(category in this.settings.catMarkers) {
+							markerImg = this.markerImage(this.settings.catMarkers[category][0], this.settings.catMarkers[category][1], this.settings.catMarkers[category][2]);
+						}
 					}
 				}
 			}

package.json

@@ -1,12 +1,12 @@
 {
   "name": "jquery-storelocator-plugin",
-	"version": "2.0.8",
+	"version": "2.0.9",
 	"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",
 		"url": "https://github.com/bjorn2404/jQuery-Store-Locator-Plugin.git"
 	},
-	"keywords": ["jquery-plugin","locator","store", "location","locations","maps","map","stores","find"],
+	"keywords": ["jquery-plugin","ecosystem:jquery","locator","store", "location","locations","maps","map","stores","find","finder"],
 	"author": {
 		"name": "Bjorn Holine",
 		"url": "http://www.bjornblog.com/"

readme.md

@@ -27,6 +27,10 @@ for even faster loading.
 
 ## Changelog
 
+### Version 2.0.9
+
+* Fixed issue when using catMarkers setting and not setting a location's category resulted in an error.
+
 ### Version 2.0.8
 
 * Changed infowindow and location list templates so that the comma is added if the city is available.

src/js/jquery.storelocator.js

@@ -796,21 +796,23 @@
 
 			// Custom multi-marker image override (different markers for different categories
 			if(this.settings.catMarkers !== null) {
-				// Multiple categories
-				if(category.indexOf(',') !== -1) {
-					// Break the category variable into an array if there are multiple categories for the location
-					categories = category.split(',');
-					// With multiple categories the color will be determined by the last matched category in the data
-					for(var i = 0; i < categories.length; i++) {
-						if(categories[i] in this.settings.catMarkers) {
-							markerImg = this.markerImage(this.settings.catMarkers[categories[i]][0], this.settings.catMarkers[categories[i]][1], this.settings.catMarkers[categories[i]][2]);
+				if(typeof category !== 'undefined') {
+					// Multiple categories
+					if(category.indexOf(',') !== -1) {
+						// Break the category variable into an array if there are multiple categories for the location
+						categories = category.split(',');
+						// With multiple categories the color will be determined by the last matched category in the data
+						for(var i = 0; i < categories.length; i++) {
+							if(categories[i] in this.settings.catMarkers) {
+								markerImg = this.markerImage(this.settings.catMarkers[categories[i]][0], this.settings.catMarkers[categories[i]][1], this.settings.catMarkers[categories[i]][2]);
+							}
 						}
 					}
-				}
-				// Single category
-				else {
-					if(category in this.settings.catMarkers) {
-						markerImg = this.markerImage(this.settings.catMarkers[category][0], this.settings.catMarkers[category][1], this.settings.catMarkers[category][2]);
+					// Single category
+					else {
+						if(category in this.settings.catMarkers) {
+							markerImg = this.markerImage(this.settings.catMarkers[category][0], this.settings.catMarkers[category][1], this.settings.catMarkers[category][2]);
+						}
 					}
 				}
 			}

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