Merge branch 'development'

bjorn2404 · Mar 29, 2015 · e016edd · e016edd
2 parents 01b91d2 + c10639e
commit e016edd
Show file tree

Hide file tree

Showing 26 changed files with 1,204 additions and 773 deletions.
diff --git a/dist/assets/js/plugins/storeLocator/jquery.storelocator.js b/dist/assets/js/plugins/storeLocator/jquery.storelocator.js
diff --git a/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js b/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js
diff --git a/dist/autogeocode-example.html b/dist/autogeocode-example.html
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/bootstrap-example.html b/dist/bootstrap-example.html
@@ -44,7 +44,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
 		<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>

diff --git a/dist/categories-example.html b/dist/categories-example.html
@@ -120,7 +120,7 @@ <h1>Using Chipotle as an Example</h1>
 	</div>
 </div>
 
-<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
 <script src="assets/js/libs/handlebars.min.js"></script>
 <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/category-markers-example.html b/dist/category-markers-example.html
@@ -35,7 +35,7 @@ <h1>Using Chipotle as an Example</h1>
 	</div>
 </div>
 
-<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
 <script src="assets/js/libs/handlebars.min.js"></script>
 <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/default-location-example.html b/dist/default-location-example.html
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/geocode.html b/dist/geocode.html
@@ -36,7 +36,7 @@ <h1>Simple geocoding form</h1>
       <div id="geocode-result"></div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/geocode.min.js"></script>
 

diff --git a/dist/index.html b/dist/index.html
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/inline-directions.html b/dist/inline-directions.html
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
 	</div>
 </div>
 
-<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
 <script src="assets/js/libs/handlebars.min.js"></script>
 <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/json-example.html b/dist/json-example.html
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/kml-example.html b/dist/kml-example.html
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/maxdistance-example.html b/dist/maxdistance-example.html
@@ -40,7 +40,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/modal-example.html b/dist/modal-example.html
@@ -34,7 +34,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/namesearch-example.html b/dist/namesearch-example.html
@@ -38,7 +38,7 @@ <h1>Using Chipotle as an Example</h1>
 	</div>
 </div>
 
-<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
 <script src="assets/js/libs/handlebars.min.js"></script>
 <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/noform-example.html b/dist/noform-example.html
@@ -31,7 +31,7 @@ <h1>Using Chipotle as an Example</h1>
       </div>
     </div>
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
     <script src="assets/js/libs/handlebars.min.js"></script>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     <script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/pagination-example.html b/dist/pagination-example.html
@@ -38,7 +38,7 @@ <h1>Using Chipotle as an Example</h1>
 			</div>
 		</div>
 
-		<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+		<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
 		<script src="assets/js/libs/handlebars.min.js"></script>
 		<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 		<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

diff --git a/dist/rawdata-example.php b/dist/rawdata-example.php
@@ -0,0 +1,79 @@
+<?php
+
+// You'll likely pass the data string from a query, etc - this is just a very basic example to show how it works
+$data = '<?xml version="1.0" encoding="utf-8"?>
+<markers>
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering " />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="true" features="Online Ordering, Fresh Guacamole" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Margaritas" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Margaritas" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Fresh Guacamole" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Fresh Guacamole" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Margaritas" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Fresh Guacamole" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Margaritas" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Fresh Guacamole" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Online Ordering, Fresh Guacamole" />
+	<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="[email protected]" web="http://www.chipotle.com" hours1="Mon-Sun 11am-10pm" hours2="" hours3="" featured="" features="Fresh Guacamole" />
+</markers>';
+
+?>
+
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Map Example - Raw Data</title>
+	<meta charset="UTF-8">
+	<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
+</head>
+
+<body>
+
+<div class="bh-sl-container">
+	<div id="page-header">
+		<h1>Using Chipotle as an Example</h1>
+		<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.
+			You can use just the city as the address - ex: Edina, MN.</p>
+	</div>
+
+	<div class="bh-sl-form-container">
+		<form id="bh-sl-user-location" method="post" action="#">
+			<div class="form-input">
+				<label for="bh-sl-address">Enter Address or Zip Code:</label>
+				<input type="text" id="bh-sl-address" name="bh-sl-address" />
+			</div>
+
+			<button id="bh-sl-submit" type="submit">Submit</button>
+		</form>
+	</div>
+
+	<div id="map-container" class="bh-sl-map-container">
+		<div class="bh-sl-loc-list">
+			<ul class="list"></ul>
+		</div>
+		<div id="bh-sl-map" class="bh-sl-map"></div>
+	</div>
+</div>
+
+<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
+<script src="assets/js/libs/handlebars.min.js"></script>
+<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
+<script>
+	$(function() {
+		$('#map-container').storeLocator({
+			'dataRaw': <?php echo json_encode($data); ?>
+		});
+	});
+</script>
+
+</body>
+</html>
diff --git a/license.txt b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Bjorn Holine
+Copyright (c) 2015 Bjorn Holine
 
 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:
 

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

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-storelocator-plugin",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"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",