Upgrade to Angular alpha.35. Closes #20

BTMorton · Aug 27, 2015 · 91fcd1b · 91fcd1b
1 parent 00f61ba
commit 91fcd1b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/NgGrid.ts b/NgGrid.ts
@@ -1,7 +1,6 @@
 /// <reference path="typings/angular2/angular2.d.ts" />
 
 import {Component, View, Directive, ElementRef, Renderer, EventEmitter, DynamicComponentLoader, Host, ViewEncapsulation, Type, ComponentRef, LifecycleEvent, KeyValueDiffer, KeyValueDiffers} from 'angular2/angular2';
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
 
 @Directive({
 	selector: '[ng-grid]',
@@ -85,7 +84,7 @@ export class NgGrid {
 	set config(v) {
 		this._config = v;
 
-		if (isBlank(this._differ) && isPresent(v)) {
+		if (this._differ == null && v != null) {
 			this._differ = this._differs.find(this._config).create(null);
 		}
 
@@ -231,9 +230,9 @@ export class NgGrid {
 	}
 
 	public onCheck():void {
-		if (isPresent(this._differ)) {
+		if (this._differ != null) {
 			var changes = this._differ.diff(this._config);
-			if (isPresent(changes)) {
+			if (changes != null) {
 				this._applyChanges(changes);
 			}
 		}
@@ -1147,10 +1146,7 @@ export class NgGridItem {
 	selector: 'div'
 })
 @View({
-	template: "",
-	styleUrls: ['NgGrid.css'],
-	directives: [NgGrid],
-	encapsulation: ViewEncapsulation.NONE
+	template: ""
 })
 class NgGridPlaceholder {
 	private _sizex: number;

diff --git a/app.ts b/app.ts
@@ -1,6 +1,6 @@
 /// <reference path="typings/angular2/angular2.d.ts" />
 
-import {Component, View, bootstrap, coreDirectives, NgStyle, formDirectives } from 'angular2/angular2';
+import {Component, View, bootstrap, CORE_DIRECTIVES, NgStyle, FORM_DIRECTIVES } from 'angular2/angular2';
 import {NgGrid, NgGridItem} from "./NgGrid";
 // import {NgTest} from "./NgTest";
 // Annotation section
@@ -10,7 +10,7 @@ import {NgGrid, NgGridItem} from "./NgGrid";
 @View({
 	templateUrl: 'app.html',
 	styleUrls: ['app.css', 'NgGrid.css'],
-	directives: [coreDirectives, NgStyle, NgGrid, NgGridItem, formDirectives]
+	directives: [CORE_DIRECTIVES, NgStyle, NgGrid, NgGridItem, FORM_DIRECTIVES]
 })
 // Component controller
 class MyAppComponent {

diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
 		<script src="https://github.jspm.io/jmcriffey/[email protected]/traceur-runtime.js"></script>
 		<script src="https://jspm.io/[email protected]"></script>
-		<script src="https://code.angularjs.org/2.0.0-alpha.34/angular2.dev.js"></script>
+		<script src="https://code.angularjs.org/2.0.0-alpha.35/angular2.dev.js"></script>
 	</head>
 	<body>
 		<my-app></my-app>

diff --git a/tsd.json b/tsd.json
@@ -6,19 +6,19 @@
   "bundle": "typings/tsd.d.ts",
   "installed": {
     "es6-promise/es6-promise.d.ts": {
-      "commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
+      "commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
     },
     "angular2/angular2.d.ts": {
-      "commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
+      "commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
     },
     "rx/rx.d.ts": {
-      "commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
+      "commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
     },
     "rx/rx-lite.d.ts": {
-      "commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
+      "commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
     },
     "angular2/router.d.ts": {
-      "commit": "338f9db37074d197764e95a487ddb865c5f2d73c"
+      "commit": "e5de5c4daf8cdc33ed60704cd6e8021c99a89f92"
     }
   }
 }