Merge branch 'canary' into canary-fixes

Author: Awk34

Diff for: src/generators/generator-base.js

@@ -48,6 +48,13 @@ export class Base extends YoBase {
   to() {
     return this.filters.expect ? ').to' : '.should';
   }
+
+  public() {
+    return this.filters.ts ? 'public ' : '';
+  }
+  private() {
+    return this.filters.ts ? 'private ' : '';
+  }
 }
 
 export class NamedBase extends Base {

Diff for: templates/app/client/app/main/main.component.js

@@ -9,18 +9,18 @@ import { SocketService } from '../../components/socket/socket.service';
     styles: [require('./main.<%=styleExt%>')],
 })
 export class MainComponent implements OnInit<% if(filters.socketio) { %>, OnDestroy<% } %> {
-  Http;
   <%_ if(filters.socketio) { -%>
   SocketService;<% } %>
   awesomeThings = [];
   <%_ if(filters.models) { -%>
   newThing = '';<% } %>
 
-  static parameters = [Http, SocketService];
-  constructor(_Http_: Http<% if(filters.socketio) { %>, _SocketService_: SocketService<% } %>) {
-    this.Http = _Http_;
+  <%_ if(filters.babel) { -%>
+  static parameters = [Http, SocketService];<% } %>
+  constructor(<%= private() %>http: Http<% if(filters.socketio) { %>, <%= private() %>socketService: SocketService<% } %>) {
+    this.Http = http;
     <%_ if(filters.socketio) { -%>
-    this.SocketService = _SocketService_;<% } %>
+    this.SocketService = socketService;<% } %>
   }
 
   ngOnInit() {