From 9315c68c892a566b4f479fa25b7b300c96f3a383 Mon Sep 17 00:00:00 2001
From: Justin Willis <jgw9617@gmail.com>
Date: Fri, 10 Jun 2016 14:43:19 -0500
Subject: [PATCH] fix(decorators): changes to match angular style guide

---
 tooling/generators/component/component.tmpl.js |  2 +-
 tooling/generators/component/component.tmpl.ts |  5 ++++-
 tooling/generators/directive/directive.tmpl.js |  2 +-
 tooling/generators/directive/directive.tmpl.ts |  2 +-
 tooling/generators/page/page.tmpl.js           |  4 ++--
 tooling/generators/page/page.tmpl.ts           |  6 +++---
 tooling/generators/pipe/pipe.tmpl.js           |  2 +-
 tooling/generators/pipe/pipe.tmpl.ts           |  2 +-
 tooling/generators/provider/provider.tmpl.js   |  4 ++--
 tooling/generators/provider/provider.tmpl.ts   | 10 ++++++----
 tooling/generators/tabs/tabs.tmpl.js           |  6 +++---
 tooling/generators/tabs/tabs.tmpl.ts           |  8 ++++----
 12 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/tooling/generators/component/component.tmpl.js b/tooling/generators/component/component.tmpl.js
index cf1fda053e..7a378982ec 100644
--- a/tooling/generators/component/component.tmpl.js
+++ b/tooling/generators/component/component.tmpl.js
@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
 
 /*
   Generated class for the <%= jsClassName %> component.
diff --git a/tooling/generators/component/component.tmpl.ts b/tooling/generators/component/component.tmpl.ts
index cf1fda053e..ce2fcb7d90 100644
--- a/tooling/generators/component/component.tmpl.ts
+++ b/tooling/generators/component/component.tmpl.ts
@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
 
 /*
   Generated class for the <%= jsClassName %> component.
@@ -11,6 +11,9 @@ import {Component} from '@angular/core';
   templateUrl: 'build/<%= directory %>/<%= fileName %>/<%= fileName %>.html'
 })
 export class <%= jsClassName %> {
+
+  text: string;
+
   constructor() {
     this.text = 'Hello World';
   }
diff --git a/tooling/generators/directive/directive.tmpl.js b/tooling/generators/directive/directive.tmpl.js
index f0a67f753b..781c9625c9 100644
--- a/tooling/generators/directive/directive.tmpl.js
+++ b/tooling/generators/directive/directive.tmpl.js
@@ -1,4 +1,4 @@
-import {Directive} from '@angular/core';
+import { Directive } from '@angular/core';
 
 /*
   Generated class for the <%= jsClassName %> directive.
diff --git a/tooling/generators/directive/directive.tmpl.ts b/tooling/generators/directive/directive.tmpl.ts
index f0a67f753b..781c9625c9 100644
--- a/tooling/generators/directive/directive.tmpl.ts
+++ b/tooling/generators/directive/directive.tmpl.ts
@@ -1,4 +1,4 @@
-import {Directive} from '@angular/core';
+import { Directive } from '@angular/core';
 
 /*
   Generated class for the <%= jsClassName %> directive.
diff --git a/tooling/generators/page/page.tmpl.js b/tooling/generators/page/page.tmpl.js
index 01c437a675..1d849dab86 100644
--- a/tooling/generators/page/page.tmpl.js
+++ b/tooling/generators/page/page.tmpl.js
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {NavController} from 'ionic-angular';
+import { Component } from '@angular/core';
+import { NavController } from 'ionic-angular';
 
 /*
   Generated class for the <%= jsClassName %> page.
diff --git a/tooling/generators/page/page.tmpl.ts b/tooling/generators/page/page.tmpl.ts
index f1f161eaea..3dbb3e0a84 100644
--- a/tooling/generators/page/page.tmpl.ts
+++ b/tooling/generators/page/page.tmpl.ts
@@ -1,5 +1,5 @@
-import {Component} from '@angular/core';
-import {NavController} from 'ionic-angular';
+import { Component } from '@angular/core';
+import { NavController } from 'ionic-angular';
 
 /*
   Generated class for the <%= jsClassName %> page.
@@ -11,5 +11,5 @@ import {NavController} from 'ionic-angular';
   templateUrl: 'build/<%= directory %>/<%= fileName %>/<%= fileName %>.html',
 })
 export class <%= jsClassName %> {
-  constructor(public nav: NavController) {}
+  constructor(private nav: NavController) {}
 }
diff --git a/tooling/generators/pipe/pipe.tmpl.js b/tooling/generators/pipe/pipe.tmpl.js
index 16dad7e55b..5aec22e8d5 100644
--- a/tooling/generators/pipe/pipe.tmpl.js
+++ b/tooling/generators/pipe/pipe.tmpl.js
@@ -1,4 +1,4 @@
-import {Injectable, Pipe} from '@angular/core';
+import { Injectable, Pipe } from '@angular/core';
 
 /*
   Generated class for the <%= jsClassName %> pipe.
diff --git a/tooling/generators/pipe/pipe.tmpl.ts b/tooling/generators/pipe/pipe.tmpl.ts
index e3ad6d3333..dc51e75704 100644
--- a/tooling/generators/pipe/pipe.tmpl.ts
+++ b/tooling/generators/pipe/pipe.tmpl.ts
@@ -1,4 +1,4 @@
-import {Injectable, Pipe} from '@angular/core';
+import { Injectable, Pipe } from '@angular/core';
 
 /*
   Generated class for the <%= jsClassName %> pipe.
diff --git a/tooling/generators/provider/provider.tmpl.js b/tooling/generators/provider/provider.tmpl.js
index 9d88c717a4..55a3a723cb 100644
--- a/tooling/generators/provider/provider.tmpl.js
+++ b/tooling/generators/provider/provider.tmpl.js
@@ -1,5 +1,5 @@
-import {Injectable} from '@angular/core';
-import {Http} from '@angular/http';
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
 import 'rxjs/add/operator/map';
 
 /*
diff --git a/tooling/generators/provider/provider.tmpl.ts b/tooling/generators/provider/provider.tmpl.ts
index 12ce71e837..3c68415f65 100644
--- a/tooling/generators/provider/provider.tmpl.ts
+++ b/tooling/generators/provider/provider.tmpl.ts
@@ -1,5 +1,5 @@
-import {Injectable} from '@angular/core';
-import {Http} from '@angular/http';
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
 import 'rxjs/add/operator/map';
 
 /*
@@ -10,9 +10,11 @@ import 'rxjs/add/operator/map';
 */
 @Injectable()
 export class <%= jsClassName %> {
-  data: any = null;
+  data: any;
 
-  constructor(public http: Http) {}
+  constructor(private http: Http) {
+    this.data = null;
+  }
 
   load() {
     if (this.data) {
diff --git a/tooling/generators/tabs/tabs.tmpl.js b/tooling/generators/tabs/tabs.tmpl.js
index dd753a6fbf..b5412393bc 100644
--- a/tooling/generators/tabs/tabs.tmpl.js
+++ b/tooling/generators/tabs/tabs.tmpl.js
@@ -1,6 +1,6 @@
-import {Component} from '@angular/core';
-import {NavController} from 'ionic-angular';
-<% _.forEach(tabs, function(tab) { %>import {<%= tab.jsClassName %>} from '../<%= tab.fileName %>/<%= tab.fileName %>';
+import { Component } from '@angular/core';
+import { NavController } from 'ionic-angular';
+<% _.forEach(tabs, function(tab) { %>import { <%= tab.jsClassName %> } from '../<%= tab.fileName %>/<%= tab.fileName %>';
 <% }); %>
 
 @Component({
diff --git a/tooling/generators/tabs/tabs.tmpl.ts b/tooling/generators/tabs/tabs.tmpl.ts
index 64ccdf7270..d940058c06 100644
--- a/tooling/generators/tabs/tabs.tmpl.ts
+++ b/tooling/generators/tabs/tabs.tmpl.ts
@@ -1,6 +1,6 @@
-import {Component} from '@angular/core';
-import {NavController} from 'ionic-angular';
-<% _.forEach(tabs, function(tab) { %>import {<%= tab.jsClassName %>} from '../<%= tab.fileName %>/<%= tab.fileName %>';
+import { Component } from '@angular/core';
+import { NavController } from 'ionic-angular';
+<% _.forEach(tabs, function(tab) { %>import { <%= tab.jsClassName %> } from '../<%= tab.fileName %>/<%= tab.fileName %>';
 <% }); %>
 
 @Component({
@@ -8,7 +8,7 @@ import {NavController} from 'ionic-angular';
 })
 export class <%= jsClassName %> {
 
-  constructor(public nav: NavController) {
+  constructor(private nav: NavController) {
     // set the root pages for each tab
     <% _.forEach(tabs, function(tab, i) { %>this.tab<%= ++i %>Root = <%= tab.jsClassName %>;
     <% }); %>