Skip to content

Commit

Permalink
Fixed template path defaults in options.md, updated Handlebars to v4.…
Browse files Browse the repository at this point in the history
…0.5, switched the default plugin styling from LESS to SASS
  • Loading branch information
bjorn2404 committed Nov 21, 2015
1 parent 9f978e6 commit ca48f2d
Show file tree
Hide file tree
Showing 20 changed files with 5,099 additions and 3,395 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea/
.sass-cache/
node_modules/
cgi-bin/
25 changes: 20 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,17 @@ module.exports = function (grunt) {
less : {
dist: {
files: {
'dist/assets/css/storelocator.css' : 'src/css/storelocator.less',
'dist/assets/css/bootstrap-example.css' : 'src/css/bootstrap-example.less'
}
}
},
sass : {
dist: {
files: {
'dist/assets/css/storelocator.css' : 'src/css/storelocator.scss'
}
}
},
concat : {
options: {
stripBanners: true
Expand Down Expand Up @@ -86,14 +92,22 @@ module.exports = function (grunt) {
}
}
},
handlebars : {
dist: {
files: {
'dist/assets/js/plugins/storeLocator/templates/compiled/standard-templates.js': 'src/templates/standard/*.html',
'dist/assets/js/plugins/storeLocator/templates/compiled/kml-templates.js': 'src/templates/kml/*.html'
}
}
},
watch : {
gruntfile: {
files: '<%= jshint.gruntfile.src %>',
tasks: ['jshint:gruntfile']
},
src : {
files : ['src/**/*'],
tasks : ['less', 'concat', 'uglify', 'usebanner', 'cssmin'],
tasks : ['less', 'sass', 'concat', 'uglify', 'usebanner', 'cssmin', 'handlebars'],
options: {
spawn : false,
livereload: true
Expand All @@ -109,18 +123,19 @@ module.exports = function (grunt) {
// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-banner');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-handlebars');

// Default task.
//grunt.registerTask('default', ['jshint', 'qunit', 'less', 'concat', 'uglify', 'usebanner', 'cssmin']);
// Build
grunt.registerTask('build', ['less', 'concat', 'uglify', 'usebanner', 'cssmin']);
grunt.registerTask('build', ['less', 'sass', 'concat', 'uglify', 'usebanner', 'cssmin', 'handlebars']);

//Watch src build
grunt.registerTask('watchsrc', ['watch:src']);

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-storelocator-plugin",
"version": "2.1.1",
"version": "2.2.0",
"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
Loading

0 comments on commit ca48f2d

Please sign in to comment.