Skip to content

Commit e5443ce

Browse files
committed
Merge pull request #1217 from SaintPeter/patch-1 into canary
fix(wiredep): only exclude bootstrap.js when ui-bootstrap is chosen closes #1217
2 parents fd6bfe9 + fbdb394 commit e5443ce

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

app/templates/Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ module.exports = function (grunt) {
248248
// Automatically inject Bower components into the app and karma.conf.js
249249
wiredep: {
250250
options: {
251-
exclude: [
252-
/bootstrap.js/,
251+
exclude: [ <% if(filters.uibootstrap) { %>
252+
/bootstrap.js/,<% } %>
253253
'/json3/',
254254
'/es5-shim/'<% if(!filters.css) { %>,
255255
/font-awesome\.css/<% if(filters.bootstrap) { %>,

0 commit comments

Comments
 (0)