Merge pull request #30 from matthewdenobrega/master

Upgraded to 2.0.0-alpha.46

Author: BTMorton

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2-grid",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "A grid-based drag/drop/resize directive plugin for Angular 2",
   "main": "NgGrid.js",
   "scripts": {
@@ -31,9 +31,9 @@
   },
   "homepage": "https://github.com/BTMorton/angular2-grid",
   "peerDependencies": {
-    "angular2": "2.0.0-alpha.44",
+    "angular2": "2.0.0-alpha.46",
     "systemjs": "^0.19.4",
-    "@reactivex/rxjs": "^5.0.0-alpha.5",
+    "@reactivex/rxjs": "5.0.0-alpha.7",
     "traceur": "0.0.91"
   },
   "files": [

src/NgGrid.ts

@@ -18,12 +18,12 @@ import {Component, View, Directive, ElementRef, Renderer, EventEmitter, DynamicC
 })
 export class NgGrid implements OnInit, DoCheck {
 	//	Event Emitters
-	public dragStart: EventEmitter = new EventEmitter();
-	public drag: EventEmitter = new EventEmitter();
-	public dragStop: EventEmitter = new EventEmitter();
-	public resizeStart: EventEmitter = new EventEmitter();
-	public resize: EventEmitter = new EventEmitter();
-	public resizeStop: EventEmitter = new EventEmitter();
+	public dragStart: EventEmitter<any> = new EventEmitter();
+	public drag: EventEmitter<any> = new EventEmitter();
+	public dragStop: EventEmitter<any> = new EventEmitter();
+	public resizeStart: EventEmitter<any> = new EventEmitter();
+	public resize: EventEmitter<any> = new EventEmitter();
+	public resizeStop: EventEmitter<any> = new EventEmitter();
 
 	//	Public variables
 	public colWidth: number = 250;
@@ -911,13 +911,13 @@ export class NgGrid implements OnInit, DoCheck {
 })
 export class NgGridItem implements OnInit {
 	//	Event Emitters
-	public itemChange: EventEmitter = new EventEmitter();
-	public dragStart: EventEmitter = new EventEmitter();
-	public drag: EventEmitter = new EventEmitter();
-	public dragStop: EventEmitter = new EventEmitter();
-	public resizeStart: EventEmitter = new EventEmitter();
-	public resize: EventEmitter = new EventEmitter();
-	public resizeStop: EventEmitter = new EventEmitter();
+	public itemChange: EventEmitter<any> = new EventEmitter();
+	public dragStart: EventEmitter<any> = new EventEmitter();
+	public drag: EventEmitter<any> = new EventEmitter();
+	public dragStop: EventEmitter<any> = new EventEmitter();
+	public resizeStart: EventEmitter<any> = new EventEmitter();
+	public resize: EventEmitter<any> = new EventEmitter();
+	public resizeStop: EventEmitter<any> = new EventEmitter();
 
 	//	Default config
 	private static CONST_DEFAULT_CONFIG: { 'col': number, 'row': number, 'sizex': number, 'sizey': number, 'dragHandle': string, 'resizeHandle': string, 'fixed': boolean, 'draggable': boolean, 'resizable': boolean } = {