fix(app): conditional include of jquery

Fixes #362
yeoman · Sep 10, 2013 · bc1e68e · bc1e68e
1 parent a0f16e2
commit bc1e68e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/index.js b/app/index.js
@@ -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'];
 
@@ -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;

diff --git a/templates/common/index.html b/templates/common/index.html
@@ -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>