Skip to content

Commit

Permalink
fix(app): conditional include of jquery
Browse files Browse the repository at this point in the history
Fixes #362
  • Loading branch information
passy committed Sep 10, 2013
1 parent a0f16e2 commit bc1e68e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ var Generator = module.exports = function Generator(args, options) {
yeoman.generators.Base.apply(this, arguments);
this.argument('appname', { type: String, required: false });
this.appname = this.appname || path.basename(process.cwd());
this.indexFile = this.engine(this.read('../../templates/common/index.html'),
this);

args = ['main'];

Expand Down Expand Up @@ -130,6 +128,10 @@ Generator.prototype.askForModules = function askForModules() {
}.bind(this));
};

Generator.prototype.readIndex = function readIndex() {
this.indexFile = this.engine(this.read('../../templates/common/index.html'), this);
};

// Waiting a more flexible solution for #138
Generator.prototype.bootstrapFiles = function bootstrapFiles() {
var sass = this.compassBootstrap;
Expand Down
2 changes: 1 addition & 1 deletion templates/common/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
ga('send', 'pageview');
</script>

<script src="bower_components/jquery/jquery.js"></script>
<% if (bootstrap) { %><script src="bower_components/jquery/jquery.js"></script><% } %>
<script src="bower_components/angular/angular.js"></script>
</body>
</html>

0 comments on commit bc1e68e

Please sign in to comment.