Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
bjorn2404 committed Apr 2, 2015
2 parents e016edd + b662f35 commit 2642b42
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions dist/assets/js/plugins/storeLocator/jquery.storelocator.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! jQuery Google Maps Store Locator - v2.0.6 - 2015-03-28
/*! jQuery Google Maps Store Locator - v2.0.7 - 2015-04-02
* http://www.bjornblog.com/web/jquery-store-locator-plugin
* Copyright (c) 2015 Bjorn Holine; Licensed MIT */

Expand Down Expand Up @@ -905,7 +905,7 @@
'markerid': markerId,
'marker' : indicator,
'length' : distLength,
'origin' : addressInput
'origin' : originalOrigin
})]
};
},
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="loc-phone">{{phone}}</div>
<div class="loc-web"><a href="{{web}}" target="_blank">{{niceURL web}}</a></div>
{{#if distance}}<div class="loc-dist">{{distance}} {{length}}</div>
<div class="loc-directions"><a href="http://maps.google.com/maps?saddr={{origin}}&amp;daddr={{address}} {{address2}} {{city}}, {{state}} {{postal}}" target="_blank">Directions</a></div>{{/if}}
<div class="loc-directions"><a href="https://maps.google.com/maps?saddr={{origin}}&amp;daddr={{address}} {{address2}} {{city}}, {{state}} {{postal}}" target="_blank">Directions</a></div>{{/if}}
</div>
</div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-storelocator-plugin",
"version": "2.0.6",
"version": "2.0.7",
"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",
Expand Down
6 changes: 6 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ for even faster loading.

## Changelog

### Version 2.0.7

* Fixed bug where reverse geocoding wasn't passing the origin to the templates (autogeocode and default location),
causing incorrect direction links.
* Updated location list directions link to use https.

### Version 2.0.6

* Added the option to filter data exclusively rather than inclusively with the exclusiveFiltering setting.
Expand Down
2 changes: 1 addition & 1 deletion src/js/jquery.storelocator.js
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@
'markerid': markerId,
'marker' : indicator,
'length' : distLength,
'origin' : addressInput
'origin' : originalOrigin
})]
};
},
Expand Down
2 changes: 1 addition & 1 deletion storelocator.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.6",
"version": "2.0.7",
"author": {
"name": "Bjorn Holine",
"url": "http://www.bjornblog.com/"
Expand Down

0 comments on commit 2642b42

Please sign in to comment.