honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs(upgrade): bring phonecat up to speed with rc.1. Use router-deprecated. 

closes #1357
This commit is contained in:
Tero Parviainen 2016-05-11 16:28:58 +03:00 committed by Ward Bell
parent fedc39dd52
commit ba47da0d70
16 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/app.module.ts
View File

@ -24,7 +24,7 @@ angular.module('phonecatApp', [
configure.$inject = ['$routeProvider']; configure.$inject = ['$routeProvider'];
function configure($routeProvider) { } function configure($routeProvider) {
// #docregion list-route // #docregion list-route
$routeProvider. $routeProvider.
when('/phones', { when('/phones', {

1
public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/systemjs.config.js
View File

@ -17,6 +17,7 @@ System.config({
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
'@angular/router': { main: 'index.js', defaultExtension: 'js' }, '@angular/router': { main: 'index.js', defaultExtension: 'js' },
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' }, '@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
'rxjs': { defaultExtension: 'js' } 'rxjs': { defaultExtension: 'js' }

17
public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
View File

@ -6,14 +6,15 @@
"repository": "https://github.com/angular/angular-phonecat", "repository": "https://github.com/angular/angular-phonecat",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@angular/common": "0.0.0-3", "@angular/common": "2.0.0-rc.1",
"@angular/compiler": "0.0.0-3", "@angular/compiler": "2.0.0-rc.1",
"@angular/core": "0.0.0-3", "@angular/core": "2.0.0-rc.1",
"@angular/http": "0.0.0-3", "@angular/http": "2.0.0-rc.1",
"@angular/platform-browser": "0.0.0-3", "@angular/platform-browser": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "0.0.0-3", "@angular/platform-browser-dynamic": "2.0.0-rc.1",
"@angular/router": "0.0.0-3", "@angular/router": "2.0.0-rc.1",
"@angular/upgrade": "0.0.0-3", "@angular/router-deprecated": "2.0.0-rc.1",
"@angular/upgrade": "2.0.0-rc.1",
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"reflect-metadata": "0.1.3", "reflect-metadata": "0.1.3",

5
public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma_test_shim.js
View File

@ -29,6 +29,7 @@ System.config({
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
'@angular/router': { main: 'index.js', defaultExtension: 'js' }, '@angular/router': { main: 'index.js', defaultExtension: 'js' },
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' }, '@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
'rxjs': { defaultExtension: 'js' } 'rxjs': { defaultExtension: 'js' }
} }
@ -37,8 +38,8 @@ System.config({
// #docregion ng2 // #docregion ng2
System.import('@angular/core/testing').then(function(testing) { System.import('@angular/core/testing').then(function(testing) {
return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) { return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) {
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_PLATFORM_PROVIDERS, testing.setBaseTestProviders(browserTesting.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
browserTesting.TEST_BROWSER_APPLICATION_PROVIDERS); browserTesting.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
}); });
}).then(function() { }).then(function() {
return Promise.all( return Promise.all(

2
public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/app.component.ts
View File

@ -1,6 +1,6 @@
// #docregion // #docregion
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { RouteConfig, ROUTER_DIRECTIVES } from '@angular/router'; import { RouteConfig, ROUTER_DIRECTIVES } from '@angular/router-deprecated';
import PhoneList from './phone_list/phone_list.component'; import PhoneList from './phone_list/phone_list.component';
import PhoneDetail from './phone_detail/phone_detail.component'; import PhoneDetail from './phone_detail/phone_detail.component';

2
public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/main.ts
View File

@ -3,7 +3,7 @@
import { provide } from '@angular/core'; import { provide } from '@angular/core';
import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { bootstrap } from '@angular/platform-browser-dynamic'; import { bootstrap } from '@angular/platform-browser-dynamic';
import { ROUTER_PROVIDERS } from '@angular/router'; import { ROUTER_PROVIDERS } from '@angular/router-deprecated';
import { Phones } from './core/phones.service'; import { Phones } from './core/phones.service';
import AppComponent from './app.component'; import AppComponent from './app.component';

2
public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts
View File

@ -1,7 +1,7 @@
// #docregion // #docregion
// #docregion top // #docregion top
import { Component, Inject } from '@angular/core'; import { Component, Inject } from '@angular/core';
import { RouteParams } from '@angular/router'; import { RouteParams } from '@angular/router-deprecated';
import { Phones, Phone } from '../core/phones.service'; import { Phones, Phone } from '../core/phones.service';
import { CheckmarkPipe } from '../core/checkmark.pipe'; import { CheckmarkPipe } from '../core/checkmark.pipe';

2
public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.component.ts
View File

@ -1,7 +1,7 @@
// #docregion full // #docregion full
// #docregion top // #docregion top
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { RouterLink } from '@angular/router'; import { RouterLink } from '@angular/router-deprecated';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { Phones, Phone } from '../core/phones.service'; import { Phones, Phone } from '../core/phones.service';

1
public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/systemjs.config.js
View File

@ -17,6 +17,7 @@ System.config({
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
'@angular/router': { main: 'index.js', defaultExtension: 'js' }, '@angular/router': { main: 'index.js', defaultExtension: 'js' },
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' }, '@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
'rxjs': { defaultExtension: 'js' } 'rxjs': { defaultExtension: 'js' }

17
public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
View File

@ -6,14 +6,15 @@
"repository": "https://github.com/angular/angular-phonecat", "repository": "https://github.com/angular/angular-phonecat",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@angular/common": "0.0.0-3", "@angular/common": "2.0.0-rc.1",
"@angular/compiler": "0.0.0-3", "@angular/compiler": "2.0.0-rc.1",
"@angular/core": "0.0.0-3", "@angular/core": "2.0.0-rc.1",
"@angular/http": "0.0.0-3", "@angular/http": "2.0.0-rc.1",
"@angular/platform-browser": "0.0.0-3", "@angular/platform-browser": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "0.0.0-3", "@angular/platform-browser-dynamic": "2.0.0-rc.1",
"@angular/router": "0.0.0-3", "@angular/router": "2.0.0-rc.1",
"@angular/upgrade": "0.0.0-3", "@angular/router-deprecated": "2.0.0-rc.1",
"@angular/upgrade": "2.0.0-rc.1",
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"reflect-metadata": "0.1.3", "reflect-metadata": "0.1.3",

5
public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma_test_shim.js
View File

@ -29,6 +29,7 @@ System.config({
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
'@angular/router': { main: 'index.js', defaultExtension: 'js' }, '@angular/router': { main: 'index.js', defaultExtension: 'js' },
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' }, '@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
'rxjs': { defaultExtension: 'js' } 'rxjs': { defaultExtension: 'js' }
} }
@ -37,8 +38,8 @@ System.config({
// #docregion ng2 // #docregion ng2
System.import('@angular/core/testing').then(function(testing) { System.import('@angular/core/testing').then(function(testing) {
return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) { return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) {
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_PLATFORM_PROVIDERS, testing.setBaseTestProviders(browserTesting.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
browserTesting.TEST_BROWSER_APPLICATION_PROVIDERS); browserTesting.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
}); });
}).then(function() { }).then(function() {
return Promise.all( return Promise.all(

2
public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_detail.component.spec.ts
View File

@ -1,6 +1,6 @@
import { provide } from '@angular/core'; import { provide } from '@angular/core';
// #docregion routeparams // #docregion routeparams
import { RouteParams } from '@angular/router'; import { RouteParams } from '@angular/router-deprecated';
// #enddocregion routeparams // #enddocregion routeparams
import { HTTP_PROVIDERS } from '@angular/http'; import { HTTP_PROVIDERS } from '@angular/http';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';

2
public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_list.component.spec.ts
View File

@ -2,7 +2,7 @@
import { provide, ApplicationRef } from '@angular/core'; import { provide, ApplicationRef } from '@angular/core';
import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { HTTP_PROVIDERS } from '@angular/http'; import { HTTP_PROVIDERS } from '@angular/http';
import { ROUTER_PROVIDERS, ROUTER_PRIMARY_COMPONENT } from '@angular/router'; import { ROUTER_PROVIDERS, ROUTER_PRIMARY_COMPONENT } from '@angular/router-deprecated';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { import {
describe, describe,

1
public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/systemjs.config.js
View File

@ -18,6 +18,7 @@ System.config({
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
'@angular/router': { main: 'index.js', defaultExtension: 'js' }, '@angular/router': { main: 'index.js', defaultExtension: 'js' },
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' }, '@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
'rxjs': { defaultExtension: 'js' } 'rxjs': { defaultExtension: 'js' }

17
public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
View File

@ -6,14 +6,15 @@
"repository": "https://github.com/angular/angular-phonecat", "repository": "https://github.com/angular/angular-phonecat",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@angular/common": "0.0.0-3", "@angular/common": "2.0.0-rc.1",
"@angular/compiler": "0.0.0-3", "@angular/compiler": "2.0.0-rc.1",
"@angular/core": "0.0.0-3", "@angular/core": "2.0.0-rc.1",
"@angular/http": "0.0.0-3", "@angular/http": "2.0.0-rc.1",
"@angular/platform-browser": "0.0.0-3", "@angular/platform-browser": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "0.0.0-3", "@angular/platform-browser-dynamic": "2.0.0-rc.1",
"@angular/router": "0.0.0-3", "@angular/router": "2.0.0-rc.1",
"@angular/upgrade": "0.0.0-3", "@angular/router-deprecated": "2.0.0-rc.1",
"@angular/upgrade": "2.0.0-rc.1",
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"reflect-metadata": "0.1.3", "reflect-metadata": "0.1.3",

5
public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma_test_shim.js
View File

@ -29,6 +29,7 @@ System.config({
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' }, '@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
'@angular/router': { main: 'index.js', defaultExtension: 'js' }, '@angular/router': { main: 'index.js', defaultExtension: 'js' },
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' }, '@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
'rxjs': { defaultExtension: 'js' } 'rxjs': { defaultExtension: 'js' }
} }
@ -37,8 +38,8 @@ System.config({
// #docregion ng2 // #docregion ng2
System.import('@angular/core/testing').then(function(testing) { System.import('@angular/core/testing').then(function(testing) {
return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) { return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) {
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_PLATFORM_PROVIDERS, testing.setBaseTestProviders(browserTesting.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
browserTesting.TEST_BROWSER_APPLICATION_PROVIDERS); browserTesting.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
}); });
}).then(function() { }).then(function() {
return Promise.all( return Promise.all(