Merge branch 'master' into release/1.4.2

Author: Anthony Dresser

components/js/slickGrid.ts

@@ -127,7 +127,7 @@ export class SlickGrid implements OnChanges, OnInit, OnDestroy, AfterViewInit {
     @Output() loadFinished: EventEmitter<void> = new EventEmitter<void>();
 
     // SLickGrid Events
-    @Output() onContextMenu: EventEmitter<Slick.OnContextMenuEventArgs<any>> = new EventEmitter<Slick.OnContextMenuEventArgs<any>>();
+    @Output() onContextMenu: EventEmitter<Slick.EventData> = new EventEmitter<Slick.EventData>();
     @Output() onScroll: EventEmitter<Slick.OnScrollEventArgs<any>> = new EventEmitter<Slick.OnScrollEventArgs<any>>();
     @Output() onActiveCellChanged: EventEmitter<Slick.OnActiveCellChangedEventArgs<any>> = new EventEmitter<Slick.OnActiveCellChangedEventArgs<any>>();
     @Output() onBeforeEditCell: EventEmitter<Slick.OnBeforeEditCellEventArgs<any>> = new EventEmitter<Slick.OnBeforeEditCellEventArgs<any>>();
@@ -502,7 +502,7 @@ export class SlickGrid implements OnChanges, OnInit, OnDestroy, AfterViewInit {
             this.onActiveCellChanged.emit(args);
         });
         this._grid.onContextMenu.subscribe((e, args) => {
-            this.onContextMenu.emit(args);
+            this.onContextMenu.emit(e);
         });
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2-slickgrid",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "",
   "main": "out/index.js",
   "scripts": {