Merge pull request #5669 from mportuga/master

dlgski · web-flow · commit c010e2020d83 · 2016-09-09T15:31:51.000-04:00
chore(grunt): Added a build flag to disable fontello
diff --git a/grunt/aliases.js b/grunt/aliases.js
@@ -36,6 +36,11 @@ module.exports = function (grunt, options) {
     baseTasks['dev'].splice(baseTasks['dev'].indexOf('autotest:unit'), 1);
   }
 
+  if (grunt.option('fontello') === false) {
+    grunt.log.writeln("Skipping fontello...");
+    baseTasks['build'].splice(baseTasks['build'].indexOf('fontello'), 1);
+  }
+
   if (process.env.TRAVIS){
     baseTasks['test:single'] = ['karma:travis'];
   }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,11 @@ module.exports = function (grunt, options) {`
`36`	`36`	`baseTasks['dev'].splice(baseTasks['dev'].indexOf('autotest:unit'), 1);`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ if (grunt.option('fontello') === false) {`
	`40`	`+ grunt.log.writeln("Skipping fontello...");`
	`41`	`+ baseTasks['build'].splice(baseTasks['build'].indexOf('fontello'), 1);`
	`42`	`+ }`
	`43`	`+`
`39`	`44`	`if (process.env.TRAVIS){`
`40`	`45`	`baseTasks['test:single'] = ['karma:travis'];`
`41`	`46`	`}`