From fa7d3bcb681bf3fee5d0001aa5924852e611b1f8 Mon Sep 17 00:00:00 2001 From: Tim Lancina Date: Mon, 22 Feb 2016 09:49:10 -0600 Subject: [PATCH] chore(generators): use @Inject for constructor params Addresses https://github.com/driftyco/ionic/issues/5544. --- tooling/generators/page/page.tmpl.js | 3 ++- tooling/generators/provider/provider.tmpl.js | 4 ++-- tooling/generators/tabs/tabs.tmpl.js | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tooling/generators/page/page.tmpl.js b/tooling/generators/page/page.tmpl.js index 8f453be589..79e8b2fec7 100644 --- a/tooling/generators/page/page.tmpl.js +++ b/tooling/generators/page/page.tmpl.js @@ -1,4 +1,5 @@ import {Page, NavController} from 'ionic/ionic'; +import {Inject} from 'angular2/core'; /* Generated class for the <%= jsClassName %> page. @@ -10,7 +11,7 @@ import {Page, NavController} from 'ionic/ionic'; templateUrl: 'build/<%= directory %>/<%= fileName %>/<%= fileName %>.html', }) export class <%= jsClassName %> { - constructor(nav: NavController) { + constructor(@Inject(NavController) nav) { this.nav = nav; } } diff --git a/tooling/generators/provider/provider.tmpl.js b/tooling/generators/provider/provider.tmpl.js index 349be4ac6a..f15dcac459 100644 --- a/tooling/generators/provider/provider.tmpl.js +++ b/tooling/generators/provider/provider.tmpl.js @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/core'; +import {Injectable, Inject} from 'angular2/core'; import {Http} from 'angular2/http'; /* @@ -9,7 +9,7 @@ import {Http} from 'angular2/http'; */ @Injectable() export class <%= jsClassName %> { - constructor(http: Http) { + constructor(@Inject(Http) http) { this.http = http; this.data = null; } diff --git a/tooling/generators/tabs/tabs.tmpl.js b/tooling/generators/tabs/tabs.tmpl.js index 322227154b..c6ed8acf7f 100644 --- a/tooling/generators/tabs/tabs.tmpl.js +++ b/tooling/generators/tabs/tabs.tmpl.js @@ -1,4 +1,5 @@ import {NavController, Page} from 'ionic/ionic'; +import {Inject} from 'angular2/core'; <% _.forEach(tabs, function(tab) { %>import {<%= tab.jsClassName %>} from '../<%= tab.fileName %>/<%= tab.fileName %>'; <% }); %> @@ -6,7 +7,7 @@ import {NavController, Page} from 'ionic/ionic'; templateUrl: 'build/<%= directory %>/<%= fileName %>/<%= fileName %>.html' }) export class <%= jsClassName %> { - constructor(nav: NavController) { + constructor(@Inject(NavController) nav) { // set the root pages for each tab <% _.forEach(tabs, function(tab, i) { %>this.tab<%= ++i %>Root = <%= tab.jsClassName %>; <% }); %>