Fixed issue with autoGeocode and originMarker, updated readme and versions

Author: bjorn2404

bower.json

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

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

@@ -2202,11 +2202,7 @@
 			if (_this.settings.originMarker === true) {
 				var originImg = '';
 
-				// If fullMapStart is on and it's the first run there is no origin
-				if(_this.settings.fullMapStart === false && firstRun === true) {
-					return;
-				}
-				else{
+				if ( typeof origin !== 'undefined' ) {
 					if(_this.settings.originMarkerImg !== null) {
 						if(_this.settings.originMarkerDim === null) {
 							originImg = _this.markerImage(_this.settings.originMarkerImg);

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

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

package.json

@@ -35,6 +35,13 @@ filtering.
 
 ## Changelog
 
+### Version 2.5.4
+
+* Fixed issue with combination of autoGeocode and originMarker settings.
+* Merged in pull request from [drcomix](https://github.com/drcomix) that fixed zoom issue with dragSearch setting.
+* Switched included remote scripts in example files to https.
+* Updated jQuery references to the latest version.
+
 ### Version 2.5.3
 
 * Removed check from createMarker method that removed spaces from categories - created issues with categories that have spaces.

readme.md

@@ -2199,11 +2199,7 @@
 			if (_this.settings.originMarker === true) {
 				var originImg = '';
 
-				// If fullMapStart is on and it's the first run there is no origin
-				if(_this.settings.fullMapStart === false && firstRun === true) {
-					return;
-				}
-				else{
+				if ( typeof origin !== 'undefined' ) {
 					if(_this.settings.originMarkerImg !== null) {
 						if(_this.settings.originMarkerDim === null) {
 							originImg = _this.markerImage(_this.settings.originMarkerImg);

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