Skip to content

Commit e016edd

Browse files
bjorn2404bjorn2404
committed
Merge branch 'development'
2 parents 01b91d2 + c10639e commit e016edd

26 files changed

+1204
-773
lines changed

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

Lines changed: 484 additions & 373 deletions
Large diffs are not rendered by default.

‎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/autogeocode-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/bootstrap-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h1>Using Chipotle as an Example</h1>
4444
</div>
4545
</div>
4646

47-
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
47+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
4848
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
4949
<script src="assets/js/libs/handlebars.min.js"></script>
5050
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>

‎dist/categories-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ <h1>Using Chipotle as an Example</h1>
120120
</div>
121121
</div>
122122

123-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
123+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
124124
<script src="assets/js/libs/handlebars.min.js"></script>
125125
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
126126
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/category-markers-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h1>Using Chipotle as an Example</h1>
3535
</div>
3636
</div>
3737

38-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3939
<script src="assets/js/libs/handlebars.min.js"></script>
4040
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4141
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/default-location-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/geocode.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h1>Simple geocoding form</h1>
3636
<div id="geocode-result"></div>
3737
</div>
3838

39-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
39+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
4040
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4141
<script src="assets/js/geocode.min.js"></script>
4242

‎dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/inline-directions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/json-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/kml-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/maxdistance-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1>Using Chipotle as an Example</h1>
4040
</div>
4141
</div>
4242

43-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
43+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
4444
<script src="assets/js/libs/handlebars.min.js"></script>
4545
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4646
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/modal-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/namesearch-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h1>Using Chipotle as an Example</h1>
3838
</div>
3939
</div>
4040

41-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
41+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
4242
<script src="assets/js/libs/handlebars.min.js"></script>
4343
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4444
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/noform-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1>Using Chipotle as an Example</h1>
3131
</div>
3232
</div>
3333

34-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
34+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
3535
<script src="assets/js/libs/handlebars.min.js"></script>
3636
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
3737
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/pagination-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h1>Using Chipotle as an Example</h1>
3838
</div>
3939
</div>
4040

41-
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
41+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
4242
<script src="assets/js/libs/handlebars.min.js"></script>
4343
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
4444
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/rawdata-example.php

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?php
2+
3+
// You'll likely pass the data string from a query, etc - this is just a very basic example to show how it works
4+
$data = '<?xml version="1.0" encoding="utf-8"?>
5+
<markers>
6+
<marker name="Chipotle Minneapolis" lat="44.947464" lng="-93.320826" category="Restaurant" address="3040 Excelsior Blvd" address2="" city="Minneapolis" state="MN" postal="55416" country="US" phone="612-922-6662" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
7+
<marker name="Chipotle St. Louis Park" lat="44.930810" lng="-93.347877" category="Restaurant" address="5480 Excelsior Blvd." address2="" city="St. Louis Park" state="MN" postal="55416" country="US" phone="952-922-1970" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering " />
8+
<marker name="Chipotle Minneapolis" lat="44.9553438" lng="-93.29719699999998" category="Restaurant, Bar" address="2600 Hennepin Ave." address2="" city="Minneapolis" state="MN" postal="55404" country="US" phone="612-377-6035" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="true" features="Online Ordering, Fresh Guacamole" />
9+
<marker name="Chipotle Golden Valley" lat="44.983935" lng="-93.380542" category="Restaurant" address="515 Winnetka Ave. N" address2="" city="Golden Valley" state="MN" postal="55427" country="US" phone="763-544-2530" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering" />
10+
<marker name="Chipotle Hopkins" lat="44.924363" lng="-93.410158" category="Cafe" address="786 Mainstreet" address2="" city="Hopkins" state="MN" postal="55343" country="US" phone="952-935-0044" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Margaritas" />
11+
<marker name="Chipotle Minneapolis" lat="44.973557" lng="-93.275111" category="Restaurant" address="1040 Nicollet Ave" address2="" city="Minneapolis" state="MN" postal="55403" country="US" phone="612-659-7955" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Margaritas" />
12+
<marker name="Chipotle Minneapolis" lat="44.97774" lng="-93.270909" category="Restaurant, Cafe" address="50 South 6th" address2="" city="Minneapolis" state="MN" postal="55402" country="US" phone="612-333-0434" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Fresh Guacamole" />
13+
<marker name="Chipotle Edina" lat="44.879826" lng="-93.321280" category="Restaurant" address="6801 York Avenue South" address2="" city="Edina" state="MN" postal="55435" country="US" phone="952-926-6651" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Fresh Guacamole" />
14+
<marker name="Chipotle Minnetonka" lat="44.970495" lng="-93.437430" category="Restaurant" address="12509 Wayzata Blvd" address2="" city="Minnetonka" state="MN" postal="55305" country="US" phone="952-252-4900" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Margaritas" />
15+
<marker name="Chipotle Minneapolis" lat="44.972808" lng="-93.247153" category="Restaurant, Coffee" address="229 Cedar Ave S" address2="" city="Minneapolis" state="MN" postal="55454" country="US" phone="612-659-7830" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
16+
<marker name="Chipotle Minneapolis" lat="44.987687" lng="-93.257581" category="Restaurant" address="225 Hennepin Ave E" address2="" city="Minneapolis" state="MN" postal="55414" country="US" phone="612-331-6330" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Fresh Guacamole" />
17+
<marker name="Chipotle Minneapolis" lat="44.973665" lng="-93.227023" category="Restaurant" address="800 Washington Ave SE" address2="" city="Minneapolis" state="MN" postal="55414" country="US" phone="612-378-7078" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
18+
<marker name="Chipotle Bloomington" lat="44.8458631" lng="-93.2860161" category="Restaurant" address="322 South Ave" address2="" city="Bloomington" state="MN" postal="55425" country="US" phone="952-252-3800" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering" />
19+
<marker name="Chipotle Wayzata" lat="44.9716626" lng="-93.4967757" category="Restaurant" address="1313 Wayzata Blvd" address2="" city="Wayzata" state="MN" postal="55391" country="US" phone="952-473-7100" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Margaritas" />
20+
<marker name="Chipotle Eden Prairie" lat="44.859761" lng="-93.436379" category="Restaurant, Bar" address="13250 Technology Dr" address2="" city="Eden Prairie" state="MN" postal="55344" country="US" phone="952-934-5955" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering" />
21+
<marker name="Chipotle Plymouth" lat="45.019846" lng="-93.481832" category="Restaurant" address="3425 Vicksburg Lane N" address2="" city="Plymouth" state="MN" postal="55447" country="US" phone="763-519-0063" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Fresh Guacamole" />
22+
<marker name="Chipotle Roseville" lat="44.998965" lng="-93.194622" category="Restaurant, Coffee" address="860 Rosedale Center Plaza" address2="" city="Roseville" state="MN" postal="55113" country="US" phone="651-633-2300" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
23+
<marker name="Chipotle St. Paul" lat="44.939865" lng="-93.136768" category="Restaurant, Bakery" address="867 Grand Ave" address2="" city="St. Paul" state="MN" postal="55105" country="US" phone="651-602-0560" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
24+
<marker name="Chipotle Chanhassen" lat="44.858736" lng="-93.533661" category="Restaurant, Bar" address="560 W 79th" address2="" city="Chanhassen" state="MN" postal="55317" country="US" phone="952-294-0301" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Fresh Guacamole" />
25+
<marker name="Chipotle St. Paul" lat="44.945127" lng="-93.095368" category="Restaurant, Coffee" address="29 5th St West" address2="" city="St. Paul" state="MN" postal="55102" country="US" phone="651-291-5411" email="info@chipotle.com" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Fresh Guacamole" />
26+
</markers>';
27+
28+
?>
29+
30+
<!DOCTYPE html>
31+
<html>
32+
<head>
33+
<title>Map Example - Raw Data</title>
34+
<meta charset="UTF-8">
35+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
36+
</head>
37+
38+
<body>
39+
40+
<div class="bh-sl-container">
41+
<div id="page-header">
42+
<h1>Using Chipotle as an Example</h1>
43+
<p>I used locations around Minneapolis and the southwest suburbs. So, for example, Edina, Plymouth, Eden Prarie, etc. would be good for testing the functionality.
44+
You can use just the city as the address - ex: Edina, MN.</p>
45+
</div>
46+
47+
<div class="bh-sl-form-container">
48+
<form id="bh-sl-user-location" method="post" action="#">
49+
<div class="form-input">
50+
<label for="bh-sl-address">Enter Address or Zip Code:</label>
51+
<input type="text" id="bh-sl-address" name="bh-sl-address" />
52+
</div>
53+
54+
<button id="bh-sl-submit" type="submit">Submit</button>
55+
</form>
56+
</div>
57+
58+
<div id="map-container" class="bh-sl-map-container">
59+
<div class="bh-sl-loc-list">
60+
<ul class="list"></ul>
61+
</div>
62+
<div id="bh-sl-map" class="bh-sl-map"></div>
63+
</div>
64+
</div>
65+
66+
<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
67+
<script src="assets/js/libs/handlebars.min.js"></script>
68+
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
69+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
70+
<script>
71+
$(function() {
72+
$('#map-container').storeLocator({
73+
'dataRaw': <?php echo json_encode($data); ?>
74+
});
75+
});
76+
</script>
77+
78+
</body>
79+
</html>

‎license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014 Bjorn Holine
1+
Copyright (c) 2015 Bjorn Holine
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
44

‎options.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
| distanceAlert | 60 | Displays alert if there are no locations with 60 m/km of the user's location. Set to -1 to disable. |
1616
| dataType | 'xml' | The format of the data source. Accepted values include kml, xml, json, and jsonp. |
1717
| dataLocation | 'data/locations.xml' | The path to the location data. |
18+
| dataRaw | null | Accepts raw KML, XML, or JSON instead of using a remote file. |
1819
| xmlElement | 'marker' | XML element used for locations (tag). |
1920
| listColor1 | '#ffffff' | Background color of the odd list elements. |
2021
| listColor2 | '#eeeeee' | Background color of the even list elements. |
@@ -45,6 +46,7 @@
4546
| nameSearch | false | Set to true to allow searching for locations by name using separate searchID field. |
4647
| searchID | 'bh-sl-search' | ID of the search input form field for location name searching. |
4748
| nameAttribute | 'name' | If using nameSearch, the data attribute used for the location name in the data file. |
49+
| visibleMarkersList | false | Set to true to have the location list only show data from markers that are visible on the map. |
4850
| infowindowTemplatePath | 'templates/infowindow-description.html' | Path to the default infowindow template. |
4951
| listTemplatePath | 'templates/location-list-description.html' | Path to the default list template. |
5052
| KMLinfowindowTemplatePath | 'templates/kml-infowindow-description.html' | Path to the KML infowindow template – used if dataType is set to kml. |
@@ -53,6 +55,7 @@
5355
| infowindowTemplateID | null | ID of infowindow template if using inline Handlebar templates instead of separate files. |
5456
| taxonomyFilters | null | Filtering object that can be used to set up live filtering (see categories example). |
5557
| taxonomyFiltersContainer | 'bh-sl-filters-container' | Class of the container around the filters. |
58+
| exclusiveFiltering | false | Set to true to enable exclusive taxonomy filtering rather than the default inclusive. |
5659
| querystringParams | false | Set to true to enable query string support for passing input variables from page to page. |
5760
| callbackNotify | null | Callback that can override the notify method. |
5861
| callbackBeforeSend | null | Callback that fires before the AJAX request. |
@@ -67,6 +70,7 @@
6770
| callbackNoResults | null | Callback that fires when no results are found. |
6871
| callbackListClick | null | Callback that fires when a list element is clicked in the location list. |
6972
| callbackMarkerClick | null | Callback that fires when a map marker is clicked. |
73+
| callbackFilters | null | Callback that fires when a filter is changed. |
7074
| addressErrorAlert | 'Unable to find address' | Language setting |
7175
| autoGeocodeErrorAlert | 'Automatic location detection failed. Please fill in your address or zip code.' | Language setting |
7276
| distanceErrorAlert | 'Unfortunately, our closest location is more than ' | Language setting |

‎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": "2.0.5",
3+
"version": "2.0.6",
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",

0 commit comments

Comments
 (0)