repackaging: all the repackaging changes squashed
This commit is contained in:
@ -15,7 +15,7 @@
|
||||
Loading...
|
||||
</example-app>
|
||||
<script>
|
||||
var filename = 'angular2/examples/router/ts/reuse/reuse_example';
|
||||
var filename = '@angular/examples/router/ts/reuse/reuse_example';
|
||||
System.import(filename).then(function(m) {
|
||||
m.main();
|
||||
}, console.error.bind(console));
|
||||
|
@ -1,15 +1,14 @@
|
||||
import {Component, provide} from 'angular2/core';
|
||||
import {bootstrap} from 'angular2/platform/browser';
|
||||
import {Component, provide, ComponentRef} from '@angular/core';
|
||||
import {bootstrap} from '@angular/platform-browser-dynamic';
|
||||
import {
|
||||
CanActivate,
|
||||
RouteConfig,
|
||||
ComponentInstruction,
|
||||
ROUTER_DIRECTIVES,
|
||||
CanReuse,
|
||||
RouteParams,
|
||||
OnReuse
|
||||
} from 'angular2/router';
|
||||
import {APP_BASE_HREF} from 'angular2/platform/common';
|
||||
} from '@angular/router';
|
||||
import {APP_BASE_HREF} from '@angular/common';
|
||||
|
||||
|
||||
// #docregion reuseCmp
|
||||
@ -48,11 +47,11 @@ class MyCmp implements CanReuse,
|
||||
{path: '/', component: MyCmp, name: 'HomeCmp'},
|
||||
{path: '/:name', component: MyCmp, name: 'HomeCmp'}
|
||||
])
|
||||
class AppCmp {
|
||||
export class AppCmp {
|
||||
}
|
||||
|
||||
|
||||
export function main() {
|
||||
export function main(): Promise<ComponentRef<AppCmp>> {
|
||||
return bootstrap(AppCmp,
|
||||
[provide(APP_BASE_HREF, {useValue: '/angular2/examples/router/ts/reuse'})]);
|
||||
[provide(APP_BASE_HREF, {useValue: '/@angular/examples/router/ts/reuse'})]);
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {verifyNoBrowserErrors, browser} from 'angular2/src/testing/e2e_util';
|
||||
import {expect} from 'angular2/testing';
|
||||
import {verifyNoBrowserErrors, browser} from '@angular/platform-browser/testing_e2e';
|
||||
import {expect} from '@angular/core/testing';
|
||||
|
||||
function waitForElement(selector: string) {
|
||||
var EC = (<any>protractor).ExpectedConditions;
|
||||
@ -11,7 +11,7 @@ describe('reuse example app', function() {
|
||||
|
||||
afterEach(verifyNoBrowserErrors);
|
||||
|
||||
var URL = 'angular2/examples/router/ts/reuse/';
|
||||
var URL = '@angular/examples/router/ts/reuse/';
|
||||
|
||||
it('should build a link which points to the detail page', function() {
|
||||
browser.get(URL);
|
||||
|
Reference in New Issue
Block a user