Skip to content

Commit 84af549

Browse files
authored
Merge pull request #297 from bjorn2404/development
Development
2 parents 5996dd6 + 4167b97 commit 84af549

File tree

8 files changed

+35
-19
lines changed

8 files changed

+35
-19
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-storelocator-plugin",
3-
"version": "3.1.13",
3+
"version": "3.1.14",
44
"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.",
55
"repository": {
66
"type": "git",

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Google Maps Store Locator - v3.1.13 - 2023-07-25
1+
/*! jQuery Google Maps Store Locator - v3.1.14 - 2023-08-08
22
* http://www.bjornblog.com/web/jquery-store-locator-plugin
33
* Copyright (c) 2023 Bjorn Holine; Licensed MIT */
44

@@ -2277,6 +2277,7 @@
22772277

22782278
if ($('#' + _this.settings.mapID).hasClass('bh-sl-map-open') === true) {
22792279
if ((olat) && (olng)) {
2280+
_this.settings.mapSettings.zoom = 0;
22802281
_this.processForm();
22812282
}
22822283
else {
@@ -2293,6 +2294,8 @@
22932294
if ((olat) && (olng)) {
22942295
if (_this.countFilters() === 0) {
22952296
_this.settings.mapSettings.zoom = originalZoom;
2297+
} else {
2298+
_this.settings.mapSettings.zoom = 0;
22962299
}
22972300

22982301
_this.processForm();
@@ -2320,9 +2323,9 @@
23202323
filters[filterKey] = [filterVal];
23212324
if ($('#' + _this.settings.mapID).hasClass('bh-sl-map-open') === true) {
23222325
if ((olat) && (olng)) {
2326+
_this.settings.mapSettings.zoom = 0;
23232327
_this.processForm();
2324-
}
2325-
else {
2328+
} else {
23262329
_this.mapping(mappingObj);
23272330
}
23282331
}
@@ -2394,7 +2397,7 @@
23942397
olat = mappingObj.lat = newCenter.lat();
23952398
olng = mappingObj.lng = newCenter.lng();
23962399

2397-
// Determine the new origin addresss
2400+
// Determine the new origin address
23982401
var newAddress = new this.reverseGoogleGeocode(this);
23992402
newCenterCoords = new google.maps.LatLng(mappingObj.lat, mappingObj.lng);
24002403
newAddress.geocode({'latLng': newCenterCoords}, function (data) {
@@ -2756,7 +2759,7 @@
27562759
dataRequest = _this._getData();
27572760
}
27582761
else {
2759-
// Setup the origin point
2762+
// Set up the origin point
27602763
originPoint = new google.maps.LatLng(orig_lat, orig_lng);
27612764

27622765
// If the origin hasn't changed use the existing data so we aren't making unneeded AJAX requests

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/categories-example.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,20 @@ <h1 class="bh-sl-title">Using Chipotle as an Example</h1>
111111
<ul id="postal-filter" class="bh-sl-filters">
112112
<li><h3>Zip</h3></li>
113113
<li>
114-
<input type="radio" name="postal" value="55416">55416
114+
<input id="zip-55416" type="radio" name="postal" value="55416">
115+
<label for="zip-55416">55416</label>
115116
</li>
116117
<li>
117-
<input type="radio" name="postal" value="55343">55343
118+
<input id="zip-55343" type="radio" name="postal" value="55343">
119+
<label for="zip-55343">55343</label>
118120
</li>
119121
<li>
120-
<input type="radio" name="postal" value="55402">55402
122+
<input id="zip-55402" type="radio" name="postal" value="55402">
123+
<label for="zip-55402">55402</label>
121124
</li>
122125
<li>
123-
<input type="radio" name="postal" value="55317">55317
126+
<input id="zip-55317" type="radio" name="postal" value="55317">
127+
<label for="zip-55317">55317</label>
124128
</li>
125129
</ul>
126130
</div>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-storelocator-plugin",
3-
"version": "3.1.13",
3+
"version": "3.1.14",
44
"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.",
55
"repository": {
66
"type": "git",

readme.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,20 @@ for even faster loading.
2727

2828
### WordPress version
2929

30-
[Cardinal Store Locator plugin for WordPress](https://cardinalwp.com/) is now available, which uses this jQuery plugin
30+
[Cardinal Locator - WordPress store locator plugin](https://cardinalwp.com/) is now available, which uses this jQuery plugin
3131
as a base and all of the settings can be set via a settings page in the WP dashboard. It also integrates with core
3232
WordPress features such as custom post types for location data and custom taxonomies for location categorization and
3333
filtering.
3434

3535

3636
## Changelog
3737

38+
### Version 3.1.14
39+
40+
* Added label tags to radio button markup in categories example file.
41+
* Fix - reverted removal of zoom reset to 0 after taxonomy filtering due to introduction of new issue.
42+
* Fixed comment typos.
43+
3844
### Version 3.1.13
3945

4046
* Fixed additional disable filtering functionality related to select options and radio buttons by globally tracking the disabled values.

src/js/jquery.storelocator.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2273,6 +2273,7 @@
22732273

22742274
if ($('#' + _this.settings.mapID).hasClass('bh-sl-map-open') === true) {
22752275
if ((olat) && (olng)) {
2276+
_this.settings.mapSettings.zoom = 0;
22762277
_this.processForm();
22772278
}
22782279
else {
@@ -2289,6 +2290,8 @@
22892290
if ((olat) && (olng)) {
22902291
if (_this.countFilters() === 0) {
22912292
_this.settings.mapSettings.zoom = originalZoom;
2293+
} else {
2294+
_this.settings.mapSettings.zoom = 0;
22922295
}
22932296

22942297
_this.processForm();
@@ -2316,9 +2319,9 @@
23162319
filters[filterKey] = [filterVal];
23172320
if ($('#' + _this.settings.mapID).hasClass('bh-sl-map-open') === true) {
23182321
if ((olat) && (olng)) {
2322+
_this.settings.mapSettings.zoom = 0;
23192323
_this.processForm();
2320-
}
2321-
else {
2324+
} else {
23222325
_this.mapping(mappingObj);
23232326
}
23242327
}
@@ -2390,7 +2393,7 @@
23902393
olat = mappingObj.lat = newCenter.lat();
23912394
olng = mappingObj.lng = newCenter.lng();
23922395

2393-
// Determine the new origin addresss
2396+
// Determine the new origin address
23942397
var newAddress = new this.reverseGoogleGeocode(this);
23952398
newCenterCoords = new google.maps.LatLng(mappingObj.lat, mappingObj.lng);
23962399
newAddress.geocode({'latLng': newCenterCoords}, function (data) {
@@ -2752,7 +2755,7 @@
27522755
dataRequest = _this._getData();
27532756
}
27542757
else {
2755-
// Setup the origin point
2758+
// Set up the origin point
27562759
originPoint = new google.maps.LatLng(orig_lat, orig_lng);
27572760

27582761
// If the origin hasn't changed use the existing data so we aren't making unneeded AJAX requests

storelocator.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"title": "jQuery Google Maps Store Locator",
44
"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.",
55
"keywords": ["jquery","locator","store","dealer","location", "locations", "maps", "map", "stores", "find"],
6-
"version": "3.1.13",
6+
"version": "3.1.14",
77
"author": {
88
"name": "Bjorn Holine",
99
"url": "https://www.bjornblog.com/"

0 commit comments

Comments
 (0)