From 9378da95c04a89b4787a316a63eb2e9089cbabcd Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Mon, 10 Feb 2014 13:01:29 -0300 Subject: [PATCH 1/2] main.css fixed. Comments on footer removed --- Gruntfile.js | 11 +++++++---- app/views/includes/foot.jade | 5 ----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1792a5a..3bb3fa0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -58,10 +58,13 @@ module.exports = function(grunt) { }, concat: { options: { - banner: '\'use strict\';\n', process: function(src, filepath) { - return '// Source: ' + filepath + '\n' + - src.replace(/(^|\n)[ \t]*('use strict'|"use strict");?\s*/g, '$1'); + if (filepath.substr(filepath.length - 2) === 'js') { + return '// Source: ' + filepath + '\n' + + src.replace(/(^|\n)[ \t]*('use strict'|"use strict");?\s*/g, '$1'); + } else { + return src; + } } }, vendors: { @@ -143,7 +146,7 @@ module.exports = function(grunt) { grunt.option('force', true); //Default task(s). - grunt.registerTask('default', ['jshint', 'concurrent']); + grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'cssmin', 'concurrent']); //Compile task (concat + minify) grunt.registerTask('compile', ['concat', 'uglify', 'cssmin']); diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index 28eabac..6da8a63 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -1,11 +1,6 @@ #footer(data-ng-include="'/views/includes/footer.html'", role='navigation') -//Vendors script(type='text/javascript', src='/socket.io/socket.io.js') script(type='text/javascript', src='/js/vendors.min.js') - -//AngularJS script(type='text/javascript', src='/js/angularjs-all.min.js') - -//Application Init script(type='text/javascript', src='/js/main.min.js') From 5d20ee5ebef90010c51afb7d4376a3f4d98c6e53 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Mon, 10 Feb 2014 13:05:09 -0300 Subject: [PATCH 2/2] revert grunt task --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3bb3fa0..6baaf2b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -146,7 +146,7 @@ module.exports = function(grunt) { grunt.option('force', true); //Default task(s). - grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'cssmin', 'concurrent']); + grunt.registerTask('default', ['jshint', 'concurrent']); //Compile task (concat + minify) grunt.registerTask('compile', ['concat', 'uglify', 'cssmin']);