Skip to content

Commit e023b53

Browse files
bjorn2404bjorn2404
committed
Restructured dist files with img/css/js now located in assets directory, fixed geocode file so correct IDs are targeted, updated jQuery include to latest version
1 parent 7e52c93 commit e023b53

39 files changed

+91
-91
lines changed

‎Gruntfile.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ module.exports = function (grunt) {
1616
less : {
1717
dist: {
1818
files: {
19-
'dist/css/storelocator.css' : 'src/css/storelocator.less',
20-
'dist/css/bootstrap-example.css' : 'src/css/bootstrap-example.less'
19+
'dist/assets/css/storelocator.css' : 'src/css/storelocator.less',
20+
'dist/assets/css/bootstrap-example.css' : 'src/css/bootstrap-example.less'
2121
}
2222
}
2323
},
@@ -27,15 +27,15 @@ module.exports = function (grunt) {
2727
},
2828
dist : {
2929
src : ['src/js/jquery.<%= pkg.name %>.js'],
30-
dest: 'dist/js/jquery.<%= pkg.name %>.js'
30+
dest: 'dist/assets/js/plugins/storeLocator/jquery.<%= pkg.name %>.js'
3131
}
3232
},
3333
uglify : {
3434
dist: {
3535
files: {
36-
'dist/js/jquery.<%= pkg.name %>.min.js': '<%= concat.dist.dest %>',
37-
'dist/js/handlebars.min.js' : 'libs/handlebars/*.js',
38-
'dist/js/geocode.min.js' : 'src/js/geocode.js'
36+
'dist/assets/js/plugins/storeLocator/jquery.<%= pkg.name %>.min.js': '<%= concat.dist.dest %>',
37+
'dist/assets/js/libs/handlebars.min.js' : 'libs/handlebars/*.js',
38+
'dist/assets/js/geocode.min.js' : 'src/js/geocode.js'
3939
}
4040
}
4141
},
@@ -73,16 +73,16 @@ module.exports = function (grunt) {
7373
banner : '<%= banner %>'
7474
},
7575
files : {
76-
'dist/js/jquery.<%= pkg.name %>.js' : 'dist/js/jquery.<%= pkg.name %>.js',
77-
'dist/js/jquery.<%= pkg.name %>.min.js': 'dist/js/jquery.<%= pkg.name %>.min.js'
76+
'dist/assets/js/plugins/storeLocator/jquery.<%= pkg.name %>.js' : 'dist/assets/js/plugins/storeLocator/jquery.<%= pkg.name %>.js',
77+
'dist/assets/js/plugins/storeLocator/jquery.<%= pkg.name %>.min.js': 'dist/assets/js/plugins/storeLocator/jquery.<%= pkg.name %>.min.js'
7878
}
7979
}
8080
},
8181
cssmin : {
8282
dist: {
8383
files: {
84-
'dist/css/storelocator.min.css': 'dist/css/storelocator.css',
85-
'dist/css/bootstrap-example.min.css': 'dist/css/bootstrap-example.css'
84+
'dist/assets/css/storelocator.min.css': 'dist/assets/css/storelocator.css',
85+
'dist/assets/css/bootstrap-example.min.css': 'dist/assets/css/bootstrap-example.css'
8686
}
8787
}
8888
},
@@ -118,7 +118,7 @@ module.exports = function (grunt) {
118118
grunt.loadNpmTasks('grunt-contrib-cssmin');
119119

120120
// Default task.
121-
grunt.registerTask('default', ['jshint', 'qunit', 'less', 'concat', 'uglify', 'usebanner', 'cssmin']);
121+
//grunt.registerTask('default', ['jshint', 'qunit', 'less', 'concat', 'uglify', 'usebanner', 'cssmin']);
122122
// Build
123123
grunt.registerTask('build', ['less', 'concat', 'uglify', 'usebanner', 'cssmin']);
124124
//Watch src build

‎dist/css/bootstrap-example.css renamed to ‎dist/assets/css/bootstrap-example.css

File renamed without changes.

‎dist/css/bootstrap-example.min.css renamed to ‎dist/assets/css/bootstrap-example.min.css

File renamed without changes.

‎dist/css/storelocator.css renamed to ‎dist/assets/css/storelocator.css

File renamed without changes.

‎dist/css/storelocator.min.css renamed to ‎dist/assets/css/storelocator.min.css

File renamed without changes.

‎dist/img/ajax-loader.gif renamed to ‎dist/assets/img/ajax-loader.gif

File renamed without changes.

‎dist/img/blue-marker.svg renamed to ‎dist/assets/img/blue-marker.svg

File renamed without changes.

‎dist/img/close-icon.png renamed to ‎dist/assets/img/close-icon.png

File renamed without changes.

‎dist/img/overlay-bg.png renamed to ‎dist/assets/img/overlay-bg.png

File renamed without changes.

‎dist/img/red-marker.svg renamed to ‎dist/assets/img/red-marker.svg

File renamed without changes.

‎dist/assets/js/geocode.min.js

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

‎dist/js/handlebars.min.js renamed to ‎dist/assets/js/libs/handlebars.min.js

File renamed without changes.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
return;
1515
}
1616

17-
// Variables used across multiple functions
17+
// Variables used across multiple methods
1818
var $this, listTemplate, infowindowTemplate, dataTypeRead, originalData, originalDataRequest, originalZoom, searchInput, addressInput, olat, olng, storeNum, directionsDisplay, directionsService;
1919
var featuredset = [], locationset = [], normalset = [], markers = [];
2020
var filters = {}, locationData = {}, GeoCodeCalc = {}, mappingObj = {};
@@ -69,10 +69,10 @@
6969
'nameSearch' : false,
7070
'searchID' : 'bh-sl-search',
7171
'nameAttribute' : 'name',
72-
'infowindowTemplatePath' : 'templates/infowindow-description.html',
73-
'listTemplatePath' : 'templates/location-list-description.html',
74-
'KMLinfowindowTemplatePath': 'templates/kml-infowindow-description.html',
75-
'KMLlistTemplatePath' : 'templates/kml-location-list-description.html',
72+
'infowindowTemplatePath' : 'assets/js/plugins/storeLocator/templates/infowindow-description.html',
73+
'listTemplatePath' : 'assets/js/plugins/storeLocator/templates/location-list-description.html',
74+
'KMLinfowindowTemplatePath': 'assets/js/plugins/storeLocator/templates/kml-infowindow-description.html',
75+
'KMLlistTemplatePath' : 'assets/js/plugins/storeLocator/templates/kml-location-list-description.html',
7676
'listTemplateID' : null,
7777
'infowindowTemplateID' : null,
7878
'taxonomyFilters' : null,

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

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

‎dist/templates/infowindow-description.html renamed to ‎dist/assets/js/plugins/storeLocator/templates/infowindow-description.html

File renamed without changes.

‎dist/templates/kml-infowindow-description.html renamed to ‎dist/assets/js/plugins/storeLocator/templates/kml-infowindow-description.html

File renamed without changes.

‎dist/templates/kml-location-list-description.html renamed to ‎dist/assets/js/plugins/storeLocator/templates/kml-location-list-description.html

File renamed without changes.

‎dist/templates/location-list-description.html renamed to ‎dist/assets/js/plugins/storeLocator/templates/location-list-description.html

File renamed without changes.

‎dist/autogeocode-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - Auto geocoding</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator({autoGeocode: true});

‎dist/bootstrap-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ <h1>Using Chipotle as an Example</h1>
4646

4747
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
4848
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
49-
<script src="js/handlebars.min.js"></script>
49+
<script src="assets/js/libs/handlebars.min.js"></script>
5050
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
51-
<script src="js/jquery.storelocator.js"></script>
51+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
5252
<script>
5353
$(function() {
5454
$('#map-container').storeLocator();

‎dist/categories-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - Categories</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -120,10 +120,10 @@ <h1>Using Chipotle as an Example</h1>
120120
</div>
121121
</div>
122122

123-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
124-
<script src="js/handlebars.min.js"></script>
123+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
124+
<script src="assets/js/libs/handlebars.min.js"></script>
125125
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
126-
<script src="js/jquery.storelocator.js"></script>
126+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
127127
<script>
128128
$(function() {
129129
$('#map-container').storeLocator({

‎dist/category-markers-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - Category Markers</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator({

‎dist/default-location-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - Default Location</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator({

‎dist/geocode.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Geocode</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
<style type="text/css">
88
/* The following is for the geocode page and not the store locator */
99
#geocode-result{
@@ -36,9 +36,9 @@ <h1>Simple geocoding form</h1>
3636
<div id="geocode-result"></div>
3737
</div>
3838

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

4343
</body>
4444
</html>

‎dist/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator();

‎dist/inline-directions.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - Inline Directions</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator({

‎dist/js/geocode.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/js/jquery.storelocator.min.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎dist/json-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - JSON Data</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator({

‎dist/kml-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - KML Data</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator({

‎dist/maxdistance-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - Maximum Distance</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -42,10 +42,10 @@ <h1>Using Chipotle as an Example</h1>
4242

4343
<div id="distances"></div>
4444

45-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
46-
<script src="js/handlebars.min.js"></script>
45+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
46+
<script src="assets/js/libs/handlebars.min.js"></script>
4747
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
48-
<script src="js/jquery.storelocator.js"></script>
48+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4949
<script>
5050
$(function() {
5151
$('#map-container').storeLocator({'maxDistance': true});

‎dist/modal-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - Modal Window</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -34,10 +34,10 @@ <h1>Using Chipotle as an Example</h1>
3434
</div>
3535
</div>
3636

37-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
38-
<script src="js/handlebars.min.js"></script>
37+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
38+
<script src="assets/js/libs/handlebars.min.js"></script>
3939
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
40-
<script src="js/jquery.storelocator.js"></script>
40+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4141
<script>
4242
$(function() {
4343
$('#map-container').storeLocator({

‎dist/namesearch-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>NameSearch Example</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -38,10 +38,10 @@ <h1>Using Chipotle as an Example</h1>
3838
</div>
3939
</div>
4040

41-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
42-
<script src="js/handlebars.min.js"></script>
41+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
42+
<script src="assets/js/libs/handlebars.min.js"></script>
4343
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
44-
<script src="js/jquery.storelocator.js"></script>
44+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
4545
<script>
4646
$(function() {
4747
$('#map-container').storeLocator({'nameSearch': true});

‎dist/noform-example.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Map Example - No Form for ASP.net</title>
55
<meta charset="UTF-8">
6-
<link rel="stylesheet" type="text/css" href="css/storelocator.css" />
6+
<link rel="stylesheet" type="text/css" href="assets/css/storelocator.css" />
77
</head>
88

99
<body>
@@ -31,10 +31,10 @@ <h1>Using Chipotle as an Example</h1>
3131
</div>
3232
</div>
3333

34-
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
35-
<script src="js/handlebars.min.js"></script>
34+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
35+
<script src="assets/js/libs/handlebars.min.js"></script>
3636
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
37-
<script src="js/jquery.storelocator.js"></script>
37+
<script src="assets/js/plugins/storeLocator/jquery.storelocator.js"></script>
3838
<script>
3939
$(function() {
4040
$('#map-container').storeLocator({'noForm':true});

0 commit comments

Comments
 (0)