Fix bootstrap.js always excluded#1217
Fix bootstrap.js always excluded#1217SaintPeter wants to merge 2 commits intoangular-fullstack:masterfrom
Conversation
Added test for `filters.uibootstrap` to exclude `bootstrap.js`
|
@SaintPeter thanks, just two things to mention. This template formatting will output a clean syntax with or without the regexp: exclude: [<% if(filters.uibootstrap) { %>
/bootstrap.js/,<% } %>
'/json3/',Second, we use If you have any questions about the above format, |
|
ok, would you like me to fix it and re-submit? |
|
You could |
|
In other words, you can overwrite your current commit, then we can just use this PR. |
|
ok, I'll give it a shot.
|
|
I made the changes as requested, but I've got a bit of a problem: I am running windows and you have a file named "!yeoman.png", which is not legal on windows. I updated the commit but cannot rebase/squash the old commit because the file shows as modified. Sorry, that's the best I can do, short of resubmitting. |
fix(wiredep): only exclude bootstrap.js when ui-bootstrap is chosen closes #1217
|
@SaintPeter I merged your commit into canary here since this PR was targeting |
|
Excellent! Sorry for the trouble. |
|
No problem at all, I'm always glad to see people contribute (: |
Added test for
filters.uibootstrap === trueto excludebootstrap.js.Fixes #565