From dcffbbab61fe717f5d379d417a5789b92a6ec488 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 17 Mar 2014 03:33:42 -0700 Subject: pass grunt into generateRawFilesJs instead of require()ing it --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 4592f1ab3..59205a25a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -460,7 +460,7 @@ module.exports = function (grunt) { grunt.registerTask('build-customizer-html', 'jade'); grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () { var banner = grunt.template.process('<%= banner %>'); - generateRawFiles(banner); + generateRawFiles(grunt, banner); }); // Task for updating the npm packages used by the Travis build. -- cgit v1.2.3 From 86dfcd1a96396fba1e65d9ffad3c34a5d8dc41a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 9 Mar 2014 13:04:48 +0100 Subject: Add build-glyphicons-data log Closes #12987 --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 59205a25a..b4438e89d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -453,7 +453,7 @@ module.exports = function (grunt) { // This can be overzealous, so its changes should always be manually reviewed! grunt.registerTask('change-version-number', 'sed'); - grunt.registerTask('build-glyphicons-data', generateGlyphiconsData); + grunt.registerTask('build-glyphicons-data', function () { generateGlyphiconsData.call(this, grunt); }); // task for building customizer grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']); -- cgit v1.2.3 From 8ae48183b236d4db104fa165b8aea762d70b9d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 24 Mar 2014 21:47:59 +0100 Subject: Fix #13138: use underscore prefix to ignore directories --- Gruntfile.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index b4438e89d..bf5705454 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -56,7 +56,7 @@ module.exports = function (grunt) { src: 'js/tests/unit/*.js' }, assets: { - src: 'docs/assets/js/src/*.js' + src: 'docs/assets/js/_src/*.js' } }, @@ -122,13 +122,13 @@ module.exports = function (grunt) { preserveComments: 'some' }, src: [ - 'docs/assets/js/vendor/less.min.js', - 'docs/assets/js/vendor/jszip.min.js', - 'docs/assets/js/vendor/uglify.min.js', - 'docs/assets/js/vendor/blob.js', - 'docs/assets/js/vendor/filesaver.js', + 'docs/assets/js/_vendor/less.min.js', + 'docs/assets/js/_vendor/jszip.min.js', + 'docs/assets/js/_vendor/uglify.min.js', + 'docs/assets/js/_vendor/blob.js', + 'docs/assets/js/_vendor/filesaver.js', 'docs/assets/js/raw-files.min.js', - 'docs/assets/js/src/customizer.js' + 'docs/assets/js/_src/customizer.js' ], dest: 'docs/assets/js/customize.min.js' }, @@ -137,8 +137,8 @@ module.exports = function (grunt) { preserveComments: 'some' }, src: [ - 'docs/assets/js/vendor/holder.js', - 'docs/assets/js/src/application.js' + 'docs/assets/js/_vendor/holder.js', + 'docs/assets/js/_src/application.js' ], dest: 'docs/assets/js/docs.min.js' } @@ -206,7 +206,7 @@ module.exports = function (grunt) { src: 'dist/css/<%= pkg.name %>-theme.css' }, docs: { - src: 'docs/assets/css/src/docs.css' + src: 'docs/assets/css/_src/docs.css' }, examples: { expand: true, @@ -240,7 +240,7 @@ module.exports = function (grunt) { ids: false, 'overqualified-elements': false }, - src: 'docs/assets/css/src/docs.css' + src: 'docs/assets/css/_src/docs.css' } }, @@ -253,8 +253,8 @@ module.exports = function (grunt) { }, docs: { src: [ - 'docs/assets/css/src/docs.css', - 'docs/assets/css/src/pygments-manni.css' + 'docs/assets/css/_src/docs.css', + 'docs/assets/css/_src/pygments-manni.css' ], dest: 'docs/assets/css/docs.min.css' } @@ -288,7 +288,7 @@ module.exports = function (grunt) { }, docs: { files: { - 'docs/assets/css/src/docs.css': 'docs/assets/css/src/docs.css' + 'docs/assets/css/_src/docs.css': 'docs/assets/css/_src/docs.css' } } }, @@ -336,8 +336,8 @@ module.exports = function (grunt) { } }, files: { - 'docs/_includes/customizer-variables.html': 'docs/jade/customizer-variables.jade', - 'docs/_includes/nav/customize.html': 'docs/jade/customizer-nav.jade' + 'docs/_includes/customizer-variables.html': 'docs/_jade/customizer-variables.jade', + 'docs/_includes/nav/customize.html': 'docs/_jade/customizer-nav.jade' } } }, -- cgit v1.2.3