Skip to content

Commit 931e0ba

Browse files
bjorn2404bjorn2404
committed
Updated jQuery references to the latest version
1 parent 4f98ae9 commit 931e0ba

21 files changed

+32
-32
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414

1515
// Variables used across multiple methods
16-
var $this, listTemplate, infowindowTemplate, dataTypeRead, originalOrigin, originalData, originalZoom, dataRequest, searchInput, addressInput, olat, olng, storeNum, directionsDisplay, directionsService, prevSelectedMarkerBefore, prevSelectedMarkerAfter;
16+
var $this, listTemplate, infowindowTemplate, dataTypeRead, originalOrigin, originalData, originalZoom, dataRequest, searchInput, addressInput, olat, olng, storeNum, directionsDisplay, directionsService, prevSelectedMarkerBefore, prevSelectedMarkerAfter, firstRun;
1717
var featuredset = [], locationset = [], normalset = [], markers = [];
1818
var filters = {}, locationData = {}, GeoCodeCalc = {}, mappingObj = {};
1919

@@ -243,6 +243,7 @@
243243
featuredset = [];
244244
normalset = [];
245245
markers = [];
246+
firstRun = false;
246247
$(document).off('click.'+pluginName, '.' + this.settings.locationList + ' li');
247248
if( $('.' + this.settings.locationList + ' .bh-sl-close-directions-container').length ) {
248249
$('.bh-sl-close-directions-container').remove();
@@ -941,7 +942,7 @@
941942
}
942943

943944
// Create the default markers
944-
if (this.settings.storeLimit === -1 || this.settings.storeLimit > 26 || this.settings.catMarkers !== null || this.settings.markerImg !== null) {
945+
if (this.settings.storeLimit === -1 || this.settings.storeLimit > 26 || this.settings.catMarkers !== null || this.settings.markerImg !== null || (this.settings.fullMapStart === true && firstRun === true && (isNaN(this.settings.fullMapStartListLimit) || this.settings.fullMapStartListLimit > 26 || this.settings.fullMapStartListLimit === -1))) {
945946
marker = new google.maps.Marker({
946947
position : point,
947948
map : map,
@@ -1001,7 +1002,7 @@
10011002
// Set up alpha character
10021003
var markerId = currentMarker.get('id');
10031004
// Use dot markers instead of alpha if there are more than 26 locations
1004-
if (this.settings.storeLimit === -1 || this.settings.storeLimit > 26) {
1005+
if (this.settings.storeLimit === -1 || this.settings.storeLimit > 26 || (this.settings.fullMapStart === true && firstRun === true && (isNaN(this.settings.fullMapStartListLimit) || this.settings.fullMapStartListLimit > 26 || this.settings.fullMapStartListLimit === -1))) {
10051006
indicator = markerId + 1;
10061007
}
10071008
else {
@@ -1406,11 +1407,10 @@
14061407
* @param data {Object} location data object
14071408
* @param lat {number} origin latitude
14081409
* @param lng {number} origin longitude
1409-
* @param firstRun {boolean} initial load check
14101410
* @param origin {string} origin address
14111411
* @param maxDistance {number} maximum distance if set
14121412
*/
1413-
locationsSetup: function (data, lat, lng, firstRun, origin, maxDistance) {
1413+
locationsSetup: function (data, lat, lng, origin, maxDistance) {
14141414
this.writeDebug('locationsSetup',arguments);
14151415
if (typeof origin !== 'undefined') {
14161416
if (!data.distance) {
@@ -1765,7 +1765,7 @@
17651765
this.writeDebug('processData',mappingObject);
17661766
var _this = this;
17671767
var i = 0;
1768-
var orig_lat, orig_lng, origin, name, maxDistance, firstRun, marker, bounds, storeStart, storeNumToShow, myOptions, noResults, distError;
1768+
var orig_lat, orig_lng, origin, name, maxDistance, marker, bounds, storeStart, storeNumToShow, myOptions, noResults, distError;
17691769
if (!this.isEmptyObject(mappingObject)) {
17701770
orig_lat = mappingObject.lat;
17711771
orig_lng = mappingObject.lng;
@@ -1812,7 +1812,7 @@
18121812
}
18131813
}
18141814

1815-
_this.locationsSetup(locationData, orig_lat, orig_lng, firstRun, origin, maxDistance);
1815+
_this.locationsSetup(locationData, orig_lat, orig_lng, origin, maxDistance);
18161816

18171817
i++;
18181818
}
@@ -1827,7 +1827,7 @@
18271827
'description': $(this).find('description').text()
18281828
};
18291829

1830-
_this.locationsSetup(locationData, orig_lat, orig_lng, firstRun, origin, maxDistance);
1830+
_this.locationsSetup(locationData, orig_lat, orig_lng, origin, maxDistance);
18311831

18321832
i++;
18331833
});
@@ -1843,7 +1843,7 @@
18431843
}
18441844
}
18451845

1846-
_this.locationsSetup(locationData, orig_lat, orig_lng, firstRun, origin, maxDistance);
1846+
_this.locationsSetup(locationData, orig_lat, orig_lng, origin, maxDistance);
18471847

18481848
i++;
18491849
});
@@ -1970,7 +1970,7 @@
19701970
}
19711971

19721972
// Avoid error if number of locations is less than the default of 26
1973-
if (_this.settings.storeLimit === -1 || locationset.length < _this.settings.storeLimit) {
1973+
if (_this.settings.storeLimit === -1 || locationset.length < _this.settings.storeLimit || (this.settings.fullMapStart === true && firstRun === true && (isNaN(this.settings.fullMapStartListLimit) || this.settings.fullMapStartListLimit > 26 || this.settings.fullMapStartListLimit === -1))) {
19741974
storeNum = locationset.length;
19751975
}
19761976
else {
@@ -2124,7 +2124,7 @@
21242124
}
21252125
else {
21262126
// Set up the location list markup
2127-
if (_this.settings.fullMapStartListLimit !== false && ! isNaN(_this.settings.fullMapStartListLimit)) {
2127+
if (firstRun && _this.settings.fullMapStartListLimit !== false && !isNaN(_this.settings.fullMapStartListLimit) && _this.settings.fullMapStartListLimit !== -1) {
21282128
for (var m = 0; m < _this.settings.fullMapStartListLimit; m++) {
21292129
var currentMarker = markers[m];
21302130
_this.listSetup(currentMarker, storeStart, page);

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

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

37-
<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.12.1.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?libraries=places"></script> <!-- Note the extra query string parameter -->
4040
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>

‎dist/autogeocode-example.html‎

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

37-
<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.12.1.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js"></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 class="bh-sl-title">Using Chipotle as an Example</h1>
4444
</div>
4545
</div>
4646

47-
<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
47+
<script src="http://code.jquery.com/jquery-1.12.1.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"></script>

‎dist/categories-example.html‎

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

123-
<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
123+
<script src="http://code.jquery.com/jquery-1.12.1.min.js"></script>
124124
<script src="assets/js/libs/handlebars.min.js"></script>
125125
<script src="http://maps.google.com/maps/api/js"></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 class="bh-sl-title">Using Chipotle as an Example</h1>
3535
</div>
3636
</div>
3737

38-
<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
38+
<script src="http://code.jquery.com/jquery-1.12.1.min.js"></script>
3939
<script src="assets/js/libs/handlebars.min.js"></script>
4040
<script src="http://maps.google.com/maps/api/js"></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 class="bh-sl-title">Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

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

‎dist/fullmapstartblank-example.html‎

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

37-
<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.12.1.min.js"></script>
3838
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js"></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.3.min.js"></script>
39+
<script src="http://code.jquery.com/jquery-1.12.1.min.js"></script>
4040
<script src="http://maps.google.com/maps/api/js"></script>
4141
<script src="assets/js/geocode.min.js"></script>
4242

0 commit comments

Comments
 (0)