fix(subgenerators): fix and normalize singleton handling

marviq · Apr 13, 2015 · d400038 · d400038
1 parent 193e657
commit d400038
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/generators/collection/templates/collection.coffee b/generators/collection/templates/collection.coffee
@@ -21,18 +21,18 @@
     #   @author         <%= user.git.name() %>
     #   @class          <%= className %>Collection
     #   @extends        Backbone.Collection<% if ( singleton ) { %>
-    #   @static<% } %>
+    #   @static<% } else { %>
+    #   @constructor<% } %>
     #   @moduletype     collection
     #   @version        0.1
     ###
     class <%= className %>Collection extends Backbone.Collection
 
-        model: <%= modelClass %>Model
+        model: <%= modelClass %>Model<% if ( singleton ) { %>
 
 
-<% if( singleton === true ) { %>
-    my<%= className %>Collection = new <%= className %>Collection()
-    return my<%= className %>Collection
-<% } %>
+    ##  Export singleton
+    ##
+    return new <%= className %>Collection()<% } %>
 
 )
diff --git a/generators/model/templates/model.coffee b/generators/model/templates/model.coffee
@@ -18,16 +18,17 @@
     #   @author         <%= user.git.name() %>
     #   @class          <%= className %>Model
     #   @extends        Backbone.Model<% if ( singleton ) { %>
-    #   @static<% } %>
+    #   @static<% } else { %>
+    #   @constructor<% } %>
     #   @moduletype     model
     #   @version        0.1
     ###
-    class <%= className %>Model extends Backbone.Model
 
+    class <%= className %>Model extends Backbone.Model<% if ( singleton ) { %>
 
-<% if( singleton === true ) { %>
-    my<%= className %>Model = new <%= className %>Model()
-    return my<%= className %>Model
-<% } %>
+
+    ##  Export singleton
+    ##
+    return new <%= className %>Model()<% } %>
 
 )