Change event names to be 'on*'. This fixes issues with the window:resize hook. Closes #74

Author: BTMorton

README.md

@@ -82,31 +82,31 @@ The defaults for the grid item are:
 Both the `NgGrid` and `NgGridItem` throw events when an item is moved or resized. The grid has the following:
 
 ```javascript
-dragStart(item)     //  When an item starts being dragged. Returns reference to corresponding NgGridItem
-drag(item)          //  When an item moves while dragging. Returns reference to corresponding NgGridItem
-dragStop(item)      //  When an item stops being dragged. Returns reference to corresponding NgGridItem
-resizeStart(item)   //  When an item starts being resized. Returns reference to corresponding NgGridItem
-resize(item)        //  When an item is resized. Returns reference to corresponding NgGridItem
-resizeStop(item)    //  When an item stops being resized. Returns reference to corresponding NgGridItem
-itemChange(items)   //  When any item stops being dragged or resized. Returns an array of NgGridItemEvents in the order in which each item was added to the grid
+onDragStart(item)     //  When an item starts being dragged. Returns reference to corresponding NgGridItem
+onDrag(item)          //  When an item moves while dragging. Returns reference to corresponding NgGridItem
+onDragStop(item)      //  When an item stops being dragged. Returns reference to corresponding NgGridItem
+onResizeStart(item)   //  When an item starts being resized. Returns reference to corresponding NgGridItem
+onResize(item)        //  When an item is resized. Returns reference to corresponding NgGridItem
+onResizeStop(item)    //  When an item stops being resized. Returns reference to corresponding NgGridItem
+onItemChange(items)   //  When any item stops being dragged or resized. Returns an array of NgGridItemEvents in the order in which each item was added to the grid
 ```
 
 The individual items will also throw the following events:
 
 ```javascript
-dragStart()     //  When the item starts being dragged.
-drag()          //  When the item moves while dragging.
-dragStop()      //  When the item stops being dragged.
-dragAny()       //  When the item starts/stops/is being dragged.
-resizeStart()   //  When the item starts being resized.
-resize()        //  When the item is resized.
-resizeStop()    //  When the item stops being resized.
-resizeAny()     //  When the item starts/stops/is being resized.
-changeStart()   //  When the item starts being dragged or resized.
-change()        //  When the item is dragged or resized.
-changeStop()    //  When the item stops being dragged or resized.
-changeAny()     //  When the item starts/stops/is being dragged or resized.
-itemChange()    //  When either the item's grid size or position is changed.
+onDragStart()     //  When the item starts being dragged.
+onDrag()          //  When the item moves while dragging.
+onDragStop()      //  When the item stops being dragged.
+onDragAny()       //  When the item starts/stops/is being dragged.
+onResizeStart()   //  When the item starts being resized.
+onResize()        //  When the item is resized.
+onResizeStop()    //  When the item stops being resized.
+onResizeAny()     //  When the item starts/stops/is being resized.
+onChangeStart()   //  When the item starts being dragged or resized.
+onChange()        //  When the item is dragged or resized.
+onChangeStop()    //  When the item stops being dragged or resized.
+onChangeAny()     //  When the item starts/stops/is being dragged or resized.
+onItemChange()    //  When either the item's grid size or position is changed.
 ```
 
 Each event will also provide the following object to any callback functions:

package.json

@@ -36,7 +36,7 @@
     "dist/NgGrid.*"
   ],
   "peerDependencies": {
-    "angular2": "^2.0.0-beta.15"
+    "angular2": "^2.0.0-beta.16"
   },
   "devDependencies": {
     "angular2": "^2.0.0-beta.16",
@@ -59,7 +59,7 @@
     "phantomjs": "^1.9.19",
     "reflect-metadata": "0.1.2",
     "run-sequence": "^1.1.5",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "^5.0.0-beta.6",
     "systemjs": "^0.19.4",
     "typescript": "^1.6.2",
     "zone.js": "^0.6.6"

src/NgGrid.d.ts

@@ -26,13 +26,13 @@ export declare class NgGrid implements OnInit, DoCheck, OnDestroy {
     private _renderer;
     private _loader;
     private _containerRef;
-    dragStart: EventEmitter<NgGridItem>;
-    drag: EventEmitter<NgGridItem>;
-    dragStop: EventEmitter<NgGridItem>;
-    resizeStart: EventEmitter<NgGridItem>;
-    resize: EventEmitter<NgGridItem>;
-    resizeStop: EventEmitter<NgGridItem>;
-    itemChange: EventEmitter<Array<NgGridItemEvent>>;
+    onDragStart: EventEmitter<NgGridItem>;
+    onDrag: EventEmitter<NgGridItem>;
+    onDragStop: EventEmitter<NgGridItem>;
+    onResizeStart: EventEmitter<NgGridItem>;
+    onResize: EventEmitter<NgGridItem>;
+    onResizeStop: EventEmitter<NgGridItem>;
+    onItemChange: EventEmitter<Array<NgGridItemEvent>>;
     colWidth: number;
     rowHeight: number;
     minCols: number;
@@ -160,19 +160,19 @@ export declare class NgGridItem implements OnInit, OnDestroy {
     private _renderer;
     private _ngGrid;
     containerRef: ViewContainerRef;
-    itemChange: EventEmitter<NgGridItemEvent>;
-    dragStart: EventEmitter<NgGridItemEvent>;
-    drag: EventEmitter<NgGridItemEvent>;
-    dragStop: EventEmitter<NgGridItemEvent>;
-    dragAny: EventEmitter<NgGridItemEvent>;
-    resizeStart: EventEmitter<NgGridItemEvent>;
-    resize: EventEmitter<NgGridItemEvent>;
-    resizeStop: EventEmitter<NgGridItemEvent>;
-    resizeAny: EventEmitter<NgGridItemEvent>;
-    changeStart: EventEmitter<NgGridItemEvent>;
-    change: EventEmitter<NgGridItemEvent>;
-    changeStop: EventEmitter<NgGridItemEvent>;
-    changeAny: EventEmitter<NgGridItemEvent>;
+    onItemChange: EventEmitter<NgGridItemEvent>;
+    onDragStart: EventEmitter<NgGridItemEvent>;
+    onDrag: EventEmitter<NgGridItemEvent>;
+    onDragStop: EventEmitter<NgGridItemEvent>;
+    onDragAny: EventEmitter<NgGridItemEvent>;
+    onResizeStart: EventEmitter<NgGridItemEvent>;
+    onResize: EventEmitter<NgGridItemEvent>;
+    onResizeStop: EventEmitter<NgGridItemEvent>;
+    onResizeAny: EventEmitter<NgGridItemEvent>;
+    onChangeStart: EventEmitter<NgGridItemEvent>;
+    onChange: EventEmitter<NgGridItemEvent>;
+    onChangeStop: EventEmitter<NgGridItemEvent>;
+    onChangeAny: EventEmitter<NgGridItemEvent>;
     private static CONST_DEFAULT_CONFIG;
     gridPosition: {
         'col': number;
@@ -200,12 +200,12 @@ export declare class NgGridItem implements OnInit, OnDestroy {
     private _added;
     config: NgGridItemConfig;
     constructor(_ngEl: ElementRef, _renderer: Renderer, _ngGrid: NgGrid, containerRef: ViewContainerRef);
-    onResizeStart(): void;
-    onResize(): void;
-    onResizeStop(): void;
-    onDragStart(): void;
-    onDrag(): void;
-    onDragStop(): void;
+    onResizeStartEvent(): void;
+    onResizeEvent(): void;
+    onResizeStopEvent(): void;
+    onDragStartEvent(): void;
+    onDragEvent(): void;
+    onDragStopEvent(): void;
     ngOnInit(): void;
     canDrag(e: any): boolean;
     canResize(e: any): string;
@@ -231,8 +231,8 @@ export declare class NgGridItem implements OnInit, OnDestroy {
         row: number;
     };
     setConfig(config: NgGridItemConfig): void;
-    setSize(x: number, y: number): void;
-    setGridPosition(col: number, row: number): void;
+    setSize(x: number, y: number, update?: boolean): void;
+    setGridPosition(col: number, row: number, update?: boolean): void;
     getEventOutput(): NgGridItemEvent;
     setPosition(x: number, y: number): void;
     setDimensions(w: number, h: number): void;