Skip to content
This repository was archived by the owner on Mar 5, 2024. It is now read-only.

Commit 91fcd1b

Browse files
committed
Upgrade to Angular alpha.35. Closes #20
1 parent 00f61ba commit 91fcd1b

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

NgGrid.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/// <reference path="typings/angular2/angular2.d.ts" />
22

33
import {Component, View, Directive, ElementRef, Renderer, EventEmitter, DynamicComponentLoader, Host, ViewEncapsulation, Type, ComponentRef, LifecycleEvent, KeyValueDiffer, KeyValueDiffers} from 'angular2/angular2';
4-
import {isPresent, isBlank} from 'angular2/src/facade/lang';
54

65
@Directive({
76
selector: '[ng-grid]',
@@ -85,7 +84,7 @@ export class NgGrid {
8584
set config(v) {
8685
this._config = v;
8786

88-
if (isBlank(this._differ) && isPresent(v)) {
87+
if (this._differ == null && v != null) {
8988
this._differ = this._differs.find(this._config).create(null);
9089
}
9190

@@ -231,9 +230,9 @@ export class NgGrid {
231230
}
232231

233232
public onCheck():void {
234-
if (isPresent(this._differ)) {
233+
if (this._differ != null) {
235234
var changes = this._differ.diff(this._config);
236-
if (isPresent(changes)) {
235+
if (changes != null) {
237236
this._applyChanges(changes);
238237
}
239238
}
@@ -1147,10 +1146,7 @@ export class NgGridItem {
11471146
selector: 'div'
11481147
})
11491148
@View({
1150-
template: "",
1151-
styleUrls: ['NgGrid.css'],
1152-
directives: [NgGrid],
1153-
encapsulation: ViewEncapsulation.NONE
1149+
template: ""
11541150
})
11551151
class NgGridPlaceholder {
11561152
private _sizex: number;

app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// <reference path="typings/angular2/angular2.d.ts" />
22

3-
import {Component, View, bootstrap, coreDirectives, NgStyle, formDirectives } from 'angular2/angular2';
3+
import {Component, View, bootstrap, CORE_DIRECTIVES, NgStyle, FORM_DIRECTIVES } from 'angular2/angular2';
44
import {NgGrid, NgGridItem} from "./NgGrid";
55
// import {NgTest} from "./NgTest";
66
// Annotation section
@@ -10,7 +10,7 @@ import {NgGrid, NgGridItem} from "./NgGrid";
1010
@View({
1111
templateUrl: 'app.html',
1212
styleUrls: ['app.css', 'NgGrid.css'],
13-
directives: [coreDirectives, NgStyle, NgGrid, NgGridItem, formDirectives]
13+
directives: [CORE_DIRECTIVES, NgStyle, NgGrid, NgGridItem, FORM_DIRECTIVES]
1414
})
1515
// Component controller
1616
class MyAppComponent {

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
55
<script src="https://github.jspm.io/jmcriffey/[email protected]/traceur-runtime.js"></script>
66
<script src="https://jspm.io/[email protected]"></script>
7-
<script src="https://code.angularjs.org/2.0.0-alpha.34/angular2.dev.js"></script>
7+
<script src="https://code.angularjs.org/2.0.0-alpha.35/angular2.dev.js"></script>
88
</head>
99
<body>
1010
<my-app></my-app>

tsd.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"bundle": "typings/tsd.d.ts",
77
"installed": {
88
"es6-promise/es6-promise.d.ts": {
9-
"commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
9+
"commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
1010
},
1111
"angular2/angular2.d.ts": {
12-
"commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
12+
"commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
1313
},
1414
"rx/rx.d.ts": {
15-
"commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
15+
"commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
1616
},
1717
"rx/rx-lite.d.ts": {
18-
"commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
18+
"commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
1919
},
2020
"angular2/router.d.ts": {
21-
"commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
21+
"commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
2222
}
2323
}
2424
}

0 commit comments

Comments
 (0)