fix(build): deselecting ngRoute does remove route stuff

ngRoute should only add route info when it is selected Closes #486 and #451 BREAKING CHANGE: Deselecting ngRoute adds controller and ng-include to index.html
angular-fullstack · Dec 6, 2013 · a358c1a · a358c1a
1 parent d20f5bd
commit a358c1a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/app/index.js b/app/index.js
@@ -175,6 +175,7 @@ Generator.prototype.askForModules = function askForModules() {
     }
     if (this.routeModule) {
       angMods.push("'ngRoute'");
+      this.env.options.ngRoute = true;
     }
 
     if (angMods.length) {
@@ -186,6 +187,7 @@ Generator.prototype.askForModules = function askForModules() {
 };
 
 Generator.prototype.readIndex = function readIndex() {
+  this.ngRoute = this.env.options.ngRoute;
   this.indexFile = this.engine(this.read('../../templates/common/index.html'), this);
 };
 
@@ -277,6 +279,7 @@ Generator.prototype.appJs = function appJs() {
 };
 
 Generator.prototype.createIndexHtml = function createIndexHtml() {
+  this.indexFile = this.indexFile.replace(/&apos;/g, "'");
   this.write(path.join(this.appPath, 'index.html'), this.indexFile);
 };
 

diff --git a/main/index.js b/main/index.js
@@ -13,5 +13,6 @@ util.inherits(Generator, ScriptBase);
 
 Generator.prototype.createAppFile = function createAppFile() {
   this.angularModules = this.env.options.angularDeps;
+  this.ngRoute = this.env.options.ngRoute;
   this.appTemplate('app', 'scripts/app');
 };
diff --git a/templates/coffeescript-min/app.coffee b/templates/coffeescript-min/app.coffee
@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module('<%= scriptAppName %>', [<%= angularModules %>])
+angular.module('<%= scriptAppName %>', [<%= angularModules %>])<% if (ngRoute) { %>
   .config ['$routeProvider', ($routeProvider) ->
     $routeProvider
       .when '/',
@@ -9,3 +9,4 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
       .otherwise
         redirectTo: '/'
   ]
+<% } %>
diff --git a/templates/coffeescript/app.coffee b/templates/coffeescript/app.coffee
@@ -1,10 +1,11 @@
 'use strict'
 
-angular.module('<%= scriptAppName %>', [<%= angularModules %>])
+angular.module('<%= scriptAppName %>', [<%= angularModules %>])<% if (ngRoute) { %>
   .config ($routeProvider) ->
     $routeProvider
       .when '/',
         templateUrl: 'views/main.html'
         controller: 'MainCtrl'
       .otherwise
         redirectTo: '/'
+<% } %>
diff --git a/templates/common/index.html b/templates/common/index.html
@@ -22,7 +22,11 @@
     <![endif]-->
 
     <!-- Add your site or application content here -->
-    <div class="container" ng-view></div>
+    <% if (ngRoute) {
+      %><div class="container" ng-view></div><%
+    } else {
+      %><div class="container" ng-include="'views/main.html'" ng-controller="MainCtrl"></div><%
+    } %>
 
     <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
      <script>

diff --git a/templates/javascript-min/app.js b/templates/javascript-min/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= scriptAppName %>', [<%= angularModules %>])
+angular.module('<%= scriptAppName %>', [<%= angularModules %>])<% if (ngRoute) { %>
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider
       .when('/', {
@@ -10,4 +10,4 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
       .otherwise({
         redirectTo: '/'
       });
-  }]);
+  }])<% } %>;
diff --git a/templates/javascript/app.js b/templates/javascript/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= scriptAppName %>', [<%= angularModules %>])
+angular.module('<%= scriptAppName %>', [<%= angularModules %>])<% if (ngRoute) { %>
   .config(function ($routeProvider) {
     $routeProvider
       .when('/', {
@@ -10,4 +10,4 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>])
       .otherwise({
         redirectTo: '/'
       });
-  });
+  })<% } %>;