'+F.settings.noResultsTitle+'
'+F.settings.noResultsDesc+"").hide().fadeIn(),w[0]={distance:0,lat:0,lng:0}),"undefined"!=typeof i&&F.sortNumerically(w),F.settings.featuredLocations===!0&&(v=a.grep(w,function(a){return"true"===a.featured}),x=a.grep(w,function(a){return"true"!==a.featured}),w=[],w=v.concat(x)),F.settings.maxDistance===!0&&t!==!0&&m){if("undefined"==typeof w[0]||w[0].distance>m)return void F.notify(F.settings.distanceErrorAlert+m+" "+q)}else-1!==F.settings.distanceAlert&&w[0].distance>F.settings.distanceAlert&&F.notify(F.settings.distanceErrorAlert+F.settings.distanceAlert+" "+q);if(F.settings.pagination===!0&&F.paginationSetup(p),F.settings.slideMap===!0&&g.slideDown(),F.settings.modal===!0&&(F.settings.callbackModalOpen&&F.settings.callbackModalOpen.call(this),a("."+F.settings.overlay).fadeIn(),a(c).on("click."+f,"."+F.settings.closeIcon+", ."+F.settings.overlay,function(){F.modalClose()}),a(c).on("click."+f,"."+F.settings.modalWindow,function(a){a.stopPropagation()}),a(c).on("keyup."+f,function(a){27===a.keyCode&&F.modalClose()})),s=-1===F.settings.storeLimit||w.lengthw.length&&(C=F.settings.locationsPerPage-(B+C-w.length)),w=w.slice(B,B+C),s=w.length):(C=s,B=0),F.settings.fullMapStart===!0&&t===!0||0===F.settings.mapSettings.zoom||"undefined"==typeof i)D=F.settings.mapSettings,A=new google.maps.LatLngBounds;else if(F.settings.pagination===!0){var O=new google.maps.LatLng(w[0].lat,w[0].lng);0===p?(F.settings.mapSettings.center=H,D=F.settings.mapSettings):(F.settings.mapSettings.center=O,D=F.settings.mapSettings)}else F.settings.mapSettings.center=H,D=F.settings.mapSettings;var P=new google.maps.Map(c.getElementById(F.settings.mapID),D);google.maps.event.addDomListener(b,"resize",function(){var a=P.getCenter();google.maps.event.trigger(P,"resize"),P.setCenter(a)}),g.data(F.settings.mapID.replace("#",""),P);var Q=new google.maps.InfoWindow;if(F.settings.originMarker===!0){var R="";if(F.settings.fullMapStart===!1&&t===!0)return;R=null!==F.settings.originMarkerImg?this.markerImage(F.settings.originMarkerImg,F.settings.originMarkerDim.width,F.settings.originMarkerDim.height):{url:"https://mt.googleapis.com/vt/icon/name=icons/spotlight/spotlight-waypoint-a.png"},u=new google.maps.Marker({position:H,map:P,icon:R,draggable:!1})}a(c).on("click."+f,".bh-sl-pagination li",function(){F.paginationChange(a(this).attr("data-page"))}),F.settings.inlineDirections===!0&&(a(c).on("click."+f,"."+F.settings.locationList+" li .loc-directions a",function(b){b.preventDefault();var c=a(this).closest("li").attr("data-markerid");F.directionsRequest(i,c,P)}),a(c).on("click."+f,"."+F.settings.locationList+" .bh-sl-close-icon",function(){F.closeDirections()}));for(var S=0;C-1>=S;S++){var T="";T=String.fromCharCode(p>0?"A".charCodeAt(0)+(B+S):"A".charCodeAt(0)+S);var U=new google.maps.LatLng(w[S].lat,w[S].lng);u=F.createMarker(U,w[S].name,w[S].address,T,P,w[S].category),u.set("id",S),y[S]=u,(F.settings.fullMapStart===!0&&t===!0||0===F.settings.mapSettings.zoom||"undefined"==typeof i)&&A.extend(U),F.createInfowindow(u,null,Q,B,p)}(F.settings.fullMapStart===!0&&t===!0||0===F.settings.mapSettings.zoom||"undefined"==typeof i)&&P.fitBounds(A);var V=a("."+F.settings.locationList+" ul");V.empty(),0===w[0].lat&&0===w[0].lng?V.append(E):a(y).each(function(a){var b=y[a];F.listSetup(b,B,p)}),a(c).on("click."+f,"."+F.settings.locationList+" li",function(){var b=a(this).data("markerid"),c=y[b];a("."+F.settings.locationList+" li").removeClass("list-focus"),a("."+F.settings.locationList+" li[data-markerid="+b+"]").addClass("list-focus"),P.panTo(c.getPosition());var d="left";F.settings.bounceMarker===!0?(c.setAnimation(google.maps.Animation.BOUNCE),setTimeout(function(){c.setAnimation(null),F.createInfowindow(c,d,Q,B,p)},700)):F.createInfowindow(c,d,Q,B,p)}),a(c).on("click."+f,"."+F.settings.locationList+" li a",function(a){a.stopPropagation()}),a("."+F.settings.locationList+" ul li:even").css("background",F.settings.listColor1),a("."+F.settings.locationList+" ul li:odd").css("background",F.settings.listColor2),F.settings.modal===!0&&F.settings.callbackModalReady&&F.settings.callbackModalReady.call(this)})}}),a.fn[f]=function(b){var c=arguments;if(b===d||"object"==typeof b)return this.each(function(){a.data(this,"plugin_"+f)||a.data(this,"plugin_"+f,new e(this,b))});if("string"==typeof b&&"_"!==b[0]&&"init"!==b){var g;return this.each(function(){var d=a.data(this,"plugin_"+f);d instanceof e&&"function"==typeof d[b]&&(g=d[b].apply(d,Array.prototype.slice.call(c,1))),"destroy"===b&&a.data(this,"plugin_"+f,null)}),g!==d?g:this}}}}(jQuery,window,document);
\ No newline at end of file
diff --git a/package.json b/package.json
index b852fb3..11bb6d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jquery-storelocator-plugin",
- "version": "2.0.3",
+ "version": "2.0.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
index e7d08fd..066004e 100644
--- a/readme.md
+++ b/readme.md
@@ -27,6 +27,13 @@ for even faster loading.
## Changelog
+### Version 2.0.4
+
+* Fixed bug with maxDistance and pagination setting combination. The last page of of the pagination results was set to
+use the locationsPerPage setting instead of the remaining number, which could have resulted in the plugin trying to
+load undefined locations.
+* Fixed bugs with googleGeocode and reverseGoogleGeocode methods in which references to "this" were undefined.
+
### Version 2.0.3
* Fixed bug with maxDistance setting - updated locationsSetup method so that the locationset array uses array.push
diff --git a/src/js/jquery.storelocator.js b/src/js/jquery.storelocator.js
index a20a699..313c39d 100644
--- a/src/js/jquery.storelocator.js
+++ b/src/js/jquery.storelocator.js
@@ -428,7 +428,7 @@
// If a default location is set
if (this.settings.defaultLoc === true) {
// The address needs to be determined for the directions link
- var r = new this.reverseGoogleGeocode();
+ var r = new this.reverseGoogleGeocode(this);
var latlng = new google.maps.LatLng(this.settings.defaultLat, this.settings.defaultLng);
r.geocode({'latLng': latlng}, function (data) {
if (data !== null) {
@@ -470,8 +470,8 @@
/**
* Geocode function used to geocode the origin (entered location)
*/
- googleGeocode: function () {
- var _this = this;
+ googleGeocode: function (thisObj) {
+ var _this = thisObj;
var geocoder = new google.maps.Geocoder();
this.geocode = function (request, callbackFunction) {
geocoder.geocode(request, function (results, status) {
@@ -491,8 +491,8 @@
/**
* Reverse geocode to get address for automatic options needed for directions link
*/
- reverseGoogleGeocode: function () {
- var _this = this;
+ reverseGoogleGeocode: function (thisObj) {
+ var _this = thisObj;
var geocoder = new google.maps.Geocoder();
this.geocode = function (request, callbackFunction) {
geocoder.geocode(request, function (results, status) {
@@ -639,6 +639,7 @@
* @returns {string}
*/
_paginationOutput: function(currentPage, totalPages) {
+
currentPage = parseFloat(currentPage);
var output = '';
var nextPage = currentPage + 1;
@@ -650,7 +651,7 @@
}
// Add the numbers
- for (var p = 0; p < totalPages; p++) {
+ for (var p = 0; p < Math.ceil(totalPages); p++) {
var n = p + 1;
if (p === currentPage) {
@@ -933,7 +934,7 @@
var _this = this;
var mappingObj = {};
// The address needs to be determined for the directions link
- var r = new this.reverseGoogleGeocode();
+ var r = new this.reverseGoogleGeocode(this);
var latlng = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
r.geocode({'latLng': latlng}, function (data) {
if (data !== null) {
@@ -1120,7 +1121,7 @@
this._start();
}
else if(addressInput !== '') {
- var g = new this.googleGeocode();
+ var g = new this.googleGeocode(this);
g.geocode({'address': addressInput, 'region': region}, function (data) {
if (data !== null) {
olat = data.latitude;
@@ -1149,7 +1150,6 @@
* Checks distance of each location and setups up the locationset array
*
* @param data {Object} location data object
- * @param l {number} iterator from the loop processing the data in the mapping function below
* @param lat {number} origin latitude
* @param lng {number} origin longitude
* @param firstRun {boolean} initial load check
@@ -1661,6 +1661,10 @@
storeNumToShow = _this.settings.locationsPerPage;
storeStart = page * _this.settings.locationsPerPage;
+ if( (storeStart + storeNumToShow) > locationset.length ) {
+ storeNumToShow = _this.settings.locationsPerPage - ((storeStart + storeNumToShow) - locationset.length);
+ }
+
locationset = locationset.slice(storeStart, storeStart + storeNumToShow);
storeNum = locationset.length;
}
diff --git a/storelocator.jquery.json b/storelocator.jquery.json
index 83a2b92..307bd21 100644
--- 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.0.3",
+ "version": "2.0.4",
"author": {
"name": "Bjorn Holine",
"url": "http://www.bjornblog.com/"