From fbdb39473cdab4d88f6faeb7a21392744a36d1f6 Mon Sep 17 00:00:00 2001 From: Rex Schrader Date: Thu, 27 Aug 2015 10:09:55 -0700 Subject: [PATCH] fix(wiredep): only exclude bootstrap.js when ui-bootstrap is chosen Fixes #565 --- app/templates/Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index 666681a89..fb5675cfd 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -248,8 +248,8 @@ module.exports = function (grunt) { // Automatically inject Bower components into the app and karma.conf.js wiredep: { options: { - exclude: [ - /bootstrap.js/, + exclude: [ <% if(filters.uibootstrap) { %> + /bootstrap.js/,<% } %> '/json3/', '/es5-shim/'<% if(!filters.css) { %>, /font-awesome\.css/<% if(filters.bootstrap) { %>,