work on #35 - assets image test, shift module dependencies to main.js

mwaylabs · Jan 27, 2015 · ff3ff76 · ff3ff76
1 parent b043491
commit ff3ff76
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/app/index.js b/app/index.js
@@ -196,9 +196,6 @@ var MGenerator = yeoman.generators.Base.extend({
     },
 
     subgenerators: function () {
-      if (this.update) {
-        return;
-      }
       this.composeWith('m:module', {
         arguments: config.DEFAULT_MODULE,
         options: {sample: 'start'}

diff --git a/app/templates/_app.js b/app/templates/_app.js
@@ -1,10 +1,5 @@
 'use strict';
 angular.module('<%= answers.appModule %>', [
-  'ionic',
-  'ngCordova',
-  'ui.router',
-  // TODO: load other modules selected during generation
-
   // your modules
   'main'
 ]);
diff --git a/module/index.js b/module/index.js
@@ -15,7 +15,7 @@ var MGenerator = yeoman.generators.NamedBase.extend({
     var moduleFolder = 'app/' + this.fileName + '/';
     this.mkdir(moduleFolder);
     this.template('_module.js', moduleFolder + this.fileName + '.js');
-    this.mkdir(moduleFolder + 'assets/');
+    this.copy('yo.png', moduleFolder + 'assets/yo@2x.png');
     this.mkdir(moduleFolder + 'controllers/');
     this.mkdir(moduleFolder + 'directives/');
     this.mkdir(moduleFolder + 'services/');

diff --git a/module/templates/_module.js b/module/templates/_module.js
@@ -1,6 +1,9 @@
 'use strict';
 angular.module('<%= module %>', [
-  'ui.router'
+  'ionic',
+  'ngCordova',
+  'ui.router',
+  // TODO: load other modules selected during generation
 ])
 .config(function ($stateProvider, $urlRouterProvider) {
 

diff --git a/module/templates/yo.png b/module/templates/yo.png
diff --git a/template/templates/_template.html b/template/templates/_template.html
@@ -4,7 +4,9 @@ <h1 class="title"><%= name %></h1>
   </ion-header-bar>
   <ion-content>
     this is your <%= name %> template<br>
-    icons working?: <span class="ion-checkmark-circled"></span><% if(options.sample === 'start') {%><br>
-    {{someData.binding}}<% } %>
+    <ul>
+      <li>icons working?: <span class="ion-checkmark-circled"></span></li>
+<% if(options.sample === 'start') {%> <li>{{someData.binding}} </li><% } %>
+    <li>images working?<br><img src="<%= moduleFolder%>/assets/yo@2x.png"></li>
   </ion-content>
 </ion-pane>