Merge branch 'master' of https://github.com/borisyankov/DefinitelyTyped into ui-grid-generic

# By Ilya Mochalov (24) and others
# Via Masahiro Wakame (87) and others
* 'master' of https://github.com/borisyankov/DefinitelyTyped: (189 commits)
  update npm-shrinkwrap.json
  update dt-tester
  fix mapbox/mapbox.d.ts
  Fix issue #5854
  lodash: changed _.pull() method
  lodash: changed _.without() method
  findup-sync: Update to v0.3.0 and include cwd property in options.
  Adding tests file and adjusting meshblu definitions
  Make a generic base version of HTMLAttributes and DOMAttributes to allow for components that pass all remaining properties to an underlying HTML element.
  lodash: added _.takeRight() method
  meshblu 1.30.1 definitions
  node-cache: added tests
  node-cache: added definitions
  Added missing gridHeight property
  Add typings and test code from Pusher Documentation (https://pusher.com/docs)
  Add version
  Provide pusher-js with typings
  Add pusher-js
  Update pubsubjs to latest version, and add exported module name
  Update reference to Q definitions
  ...

Conflicts:
	ui-grid/ui-grid-tests.ts
	ui-grid/ui-grid.d.ts

ui-grid/ui-grid-tests.ts

@@ -115,4 +115,12 @@ var gridOptions: uiGrid.IGridOptions<MyEntity> = {
             console.log(row.entity.name);
         })
     }
-}
+}
+var rowEntityToScrollTo = {anObject: 'inGridOptionsData'};
+var columnDefToScrollTo: uiGrid.IColumnDef;
+gridInstance.scrollTo();
+gridInstance.scrollTo(rowEntityToScrollTo);
+gridInstance.scrollTo(rowEntityToScrollTo, columnDefToScrollTo);
+
+var selectedRowEntities: Array<any> = gridApi.selection.getSelectedRows();
+var selectedGridRows: Array<uiGrid.IGridRow> = gridApi.selection.getSelectedGridRows();

ui-grid/ui-grid.d.ts

@@ -441,11 +441,11 @@ declare module uiGrid {
         /**
          * Scroll the grid such that the specified
          * row and column is in view
-         * @param {any} rowEntity gridOptions.data[] array instance to make visible
+         * @param {any} rowEntity gridOptions.data[] array element to make visible
          * @param {IColumnDef} colDef to make visible
          * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
          */
-        scrollTo(rowEntity: IGridRow<TEntity>, colDef: IColumnDef<TEntity>): ng.IPromise<any>;
+        scrollTo(rowEntity?: TEntity, colDef?: IColumnDef<TEntity>): ng.IPromise<any>;
         /**
          * Scrolls the grid to make a certain row and column combo visible,
          * in the case that it is not completely visible on the screen already.
@@ -489,6 +489,10 @@ declare module uiGrid {
          * returns the total footer height gridFooter + columnFooter
          */
         footerHeight?: number;
+        /**
+         * returns or sets grid height in pixels
+         */
+        gridHeight?: number;
         /**
          * set to true when Grid is scrolling horizontally. Set to false via debounced method
          */
@@ -2823,7 +2827,7 @@ declare module uiGrid {
              * returns all selected rows as gridRows
              * @returns {Array<IGridRow>} The selected rows
              */
-            getSelectedGridRows(): Array<any>;
+            getSelectedGridRows(): Array<uiGrid.IGridRow>;
             /**
              * Gets selected rows as entities
              * @returns {Array<any>} Selected row entities