Skip to content

Commit 0f73a4d

Browse files
committed
updating kitchen sink to beta.16
1 parent 6e91410 commit 0f73a4d

File tree

7 files changed

+22
-45
lines changed

7 files changed

+22
-45
lines changed

example-apps/kitchen-sink-example/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"devDependencies": {},
99
"dependencies": {
10-
"angular2": "2.0.0-beta.15",
10+
"angular2": "2.0.0-beta.16",
1111
"core-js": "^2.2.1",
1212
"css-loader": "^0.21.0",
1313
"d3": "^3.5.16",
@@ -21,13 +21,13 @@
2121
"rimraf": "^2.4.3",
2222
"rxjs": "^5.0.0-beta.2",
2323
"style-loader": "^0.13.0",
24-
"ts-loader": "^0.7.2",
25-
"tslint-loader": "^1.0.2",
24+
"ts-loader": "^0.8.2",
25+
"tslint-loader": "^2.1.4",
2626
"typescript": "^1.8.9",
2727
"typings": "^0.7.11",
2828
"url-loader": "^0.5.6",
29-
"webpack": "^1.12.9",
30-
"webpack-dev-server": "^1.14.0",
31-
"zone.js": "^0.6.10"
29+
"webpack": "^1.13.0",
30+
"webpack-dev-server": "^1.14.1",
31+
"zone.js": "^0.6.12"
3232
}
3333
}

example-apps/kitchen-sink-example/source/app.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
// Load Global Styles
2-
import {ROUTER_PROVIDERS, LocationStrategy,
3-
HashLocationStrategy, APP_BASE_HREF} from 'angular2/router';
2+
import {ROUTER_PROVIDERS} from 'angular2/router';
3+
4+
import {
5+
LocationStrategy,
6+
HashLocationStrategy,
7+
APP_BASE_HREF}
8+
from 'angular2/platform/common';
9+
410
import {provide} from 'angular2/core';
511
import {FORM_DIRECTIVES} from 'angular2/common';
612
import {bootstrap} from 'angular2/platform/browser';
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
import {Component, Input} from 'angular2/core';
2-
import LoadIntoComponent from './load-into-component';
32
import LoadAsRootComponent from './load-as-root-component';
43
import LoadNextToComponent from './load-next-to-component';
54

65
@Component({
76
selector: 'dynamic-controls',
87
template: `
98
<div>
10-
<load-into-component></load-into-component>
11-
<hr/>
129
<load-next-to-component></load-next-to-component>
1310
<hr/>
1411
<load-as-root-component></load-as-root-component>
1512
</div>
1613
`,
17-
directives: [LoadIntoComponent, LoadAsRootComponent, LoadNextToComponent]
14+
directives: [LoadAsRootComponent, LoadNextToComponent]
1815
})
1916
export default class DynamicControls {}

example-apps/kitchen-sink-example/source/components/dynamic-controls/load-as-root-component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default class LoadAsRootComponent {
2424
private injector: Injector) { }
2525

2626
loadComponent() {
27-
this.dcl.loadAsRoot(DynamicComponent, '#anchor', null)
27+
this.dcl.loadAsRoot(DynamicComponent, '#anchor', this.injector)
2828
.then(componentRef => console.log('loadAsRoot', componentRef));
2929
}
3030
}

example-apps/kitchen-sink-example/source/components/dynamic-controls/load-into-component.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

example-apps/kitchen-sink-example/source/components/dynamic-controls/load-next-to-component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {Component, DynamicComponentLoader, ElementRef} from 'angular2/core';
1+
import {Component, DynamicComponentLoader, ViewContainerRef}
2+
from 'angular2/core';
23
import DynamicComponent from './dynamic-component';
34
import Hello from './hello';
45

@@ -17,7 +18,7 @@ import Hello from './hello';
1718
export default class LoadNextToComponent {
1819
constructor(
1920
private dcl: DynamicComponentLoader,
20-
private elementRef: ElementRef) { }
21+
private elementRef: ViewContainerRef) { }
2122

2223
loadComponent() {
2324
this.dcl.loadNextToLocation(DynamicComponent, this.elementRef)

example-apps/kitchen-sink-example/source/components/form-controls/form2.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import {Component} from 'angular2/core';
22
import {FORM_DIRECTIVES} from 'angular2/common';
3-
import {ROUTER_DIRECTIVES, RouterLink, Location, RouteParams, Router}
3+
import {ROUTER_DIRECTIVES, RouterLink, RouteParams, Router}
44
from 'angular2/router';
55

6+
import {Location} from 'angular2/platform/common';
7+
68
@Component({
79
selector: 'form2',
810
directives: [FORM_DIRECTIVES, RouterLink, ROUTER_DIRECTIVES],

0 commit comments

Comments
 (0)