javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-26 08:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename Router to Router_OLD

Browse Source
This commit is contained in:
Adam Bradley
2015-06-29 11:17:52 -05:00
parent 28b77b0fbc
commit 8c48693bf7
7 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/nav/test/basic/pages/first-page.js
View File

@ -1,7 +1,7 @@
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {IonicView, IonicConfig, IonicApp} from 'ionic/ionic';
import {NavParams, Routable, Router, NavController} from 'ionic/ionic';
import {NavParams, Routable, Router_OLD, NavController} from 'ionic/ionic';
import {SecondPage} from './second-page'
@ -40,7 +40,7 @@ export class FirstPage {
console.log('config', config)
// TODO: Shouldn't have to do this
Router.setNavController(nav);
Router_OLD.setNavController(nav);
this.nav = nav;
this.val = Math.round(Math.random() * 8999) + 1000;

4
ionic/components/nav/test/basic/pages/second-page.js
View File

@ -1,6 +1,6 @@
import {Component} from 'angular2/src/core/annotations_impl/annotations';
import {IonicView, Routable, Router, NavController, NavParams} from 'ionic/ionic';
import {IonicView, Routable, Router_OLD, NavController, NavParams} from 'ionic/ionic';
import {ThirdPage} from './third-page';
@ -31,7 +31,7 @@ export class SecondPage {
params: NavParams
) {
// TODO: Shouldn't have to do this
Router.setNavController(nav);
Router_OLD.setNavController(nav);
this.nav = nav;
this.params = params;

4
ionic/components/nav/test/basic/pages/third-page.js
View File

@ -1,6 +1,6 @@
import {Component} from 'angular2/src/core/annotations_impl/annotations';
import {IonicView, Router, Routable, NavController} from 'ionic/ionic';
import {IonicView, Router_OLD, Routable, NavController} from 'ionic/ionic';
@Component({selector: 'ion-view'})
@ -22,7 +22,7 @@ export class ThirdPage {
this.nav = nav
// TODO: Shouldn't have to do this
Router.setNavController(nav);
Router_OLD.setNavController(nav);
}
pop() {