javascriptDev
diff --git a/‎route/index.js‎
Lines changed: 5 additions & 13 deletions b/‎route/index.js‎
Lines changed: 5 additions & 13 deletions
diff --git a/‎script-base.js‎
Lines changed: 16 additions & 8 deletions b/‎script-base.js‎
Lines changed: 16 additions & 8 deletions
@@ -1,26 +1,18 @@
 'use strict';
 var path = require('path');
 var util = require('util');
-var yeoman = require('yeoman-generator');
+var ScriptBase = require('../script-base.js');
 var angularUtils = require('../util.js');
 
 
 module.exports = Generator;
 
 function Generator() {
-  yeoman.generators.NamedBase.apply(this, arguments);
-  this.sourceRoot(path.join(__dirname, '../templates'));
-
-  this.hookFor('angular:controller', {
-    args: [this.name]
-  });
-
-  this.hookFor('angular:view', {
-    args: [this.name]
-  });
+  ScriptBase.apply(this, arguments);
+  this.hookFor('angular:controller');
+  this.hookFor('angular:view');
 }
-
-util.inherits(Generator, yeoman.generators.NamedBase);
+util.inherits(Generator, ScriptBase);
 
 Generator.prototype.rewriteAppJs = function () {
   angularUtils.rewriteFile({
 
@@ -9,25 +9,33 @@ module.exports = Generator;
 function Generator() {
   yeoman.generators.NamedBase.apply(this, arguments);
 
-  this.option('coffee');
+  if (typeof this.env.options.coffee === 'undefined') {
+    this.option('coffee');
 
-  // attempt to detect if user is using CS or not
-  // if cml arg provided, use that; else look for the existence of cs
+    // attempt to detect if user is using CS or not
+    // if cml arg provided, use that; else look for the existence of cs
+    if (!this.options.coffee &&
+      this.expandFiles('/app/scripts/**/*.coffee', {}).length > 0) {
+      this.options.coffee = true;
+    }
 
-  if (!this.options.coffee &&
-    this.expandFiles('/app/scripts/**/*.coffee', {}).length > 0) {
-    this.options.coffee = true;
+    this.env.options.coffee = this.options.coffee;
+  }
+
+  if (typeof this.env.options.minsafe === 'undefined') {
+    this.option('minsafe');
+    this.env.options.minsafe = this.options.minsafe;
   }
 
   var sourceRoot = '/templates/javascript';
   this.scriptSuffix = '.js';
 
-  if (this.options.coffee) {
+  if (this.env.options.coffee) {
     sourceRoot = '/templates/coffeescript';
     this.scriptSuffix = '.coffee';
   }
 
-  if (this.options.minsafe) {
+  if (this.env.options.minsafe) {
     sourceRoot += '-min';
   }