From 0bc18bba93d7cb1601dab5a7e19b163a7b3bda41 Mon Sep 17 00:00:00 2001
From: Dan Lewi Harkestad <dan.lewi.harkestad@kongsberg.com>
Date: Fri, 4 Sep 2015 08:52:24 +0200
Subject: [PATCH 1/3] Fixed row getters in selection API.

See: http://ui-grid.info/docs/#/api/ui.grid.selection.api:PublicApi

getSelectedGridRows should return uiGrid.IGridRow, not the
uiGrid.selection.IGridRow interface which only has the selection-specific
properties.

getSelectedRows returns the selected entities, not grid rows.
---
 ui-grid/ui-grid-tests.ts | 2 ++
 ui-grid/ui-grid.d.ts     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
index 21d42c021..485f7d378 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -100,3 +100,5 @@ gridApi.core.queueGridRefresh()
 gridApi.core.queueRefresh();
 gridApi.core.registerColumnsProcessor(colProcessor, 100);
 
+var selectedRowEntities: Array<any> = gridApi.selection.getSelectedRows();
+var selectedGridRows: Array<uiGrid.IGridRow> = gridApi.selection.getSelectedGridRows();
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
index 5f66eca1f..38a7aadbf 100644
--- a/ui-grid/ui-grid.d.ts
+++ b/ui-grid/ui-grid.d.ts
@@ -2823,12 +2823,12 @@ declare module uiGrid {
              * returns all selected rows as gridRows
              * @returns {Array<IGridRow>} The selected rows
              */
-            getSelectedGridRows(): Array<IGridRow>;
+            getSelectedGridRows(): Array<uiGrid.IGridRow>;
             /**
              * Gets selected rows as entities
              * @returns {Array<any>} Selected row entities
              */
-            getSelectedRows(): Array<IGridRow>;
+            getSelectedRows(): Array<any>;
             /**
              * Selects all rows.  Does nothing if multiselect = false
              * @param {ng.IAngularEvent} event object if raised from event

From de418bbbb42567d24f8b26a390bb9a9dbb711084 Mon Sep 17 00:00:00 2001
From: Dan Lewi Harkestad <dan.lewi.harkestad@kongsberg.com>
Date: Mon, 7 Sep 2015 14:34:51 +0200
Subject: [PATCH 2/3] GridInstance.scrollTo takes an object in the data array
 as parameter, not a GridRow.

Also, both parameters are optional.

See
https://github.com/angular-ui/ui-grid/blob/a42dab24532fb896725b9fc8359e4526e436c891/src/js/core/factories/Grid.js#L2419-L2440
---
 ui-grid/ui-grid-tests.ts | 6 ++++++
 ui-grid/ui-grid.d.ts     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
index 485f7d378..4eedf8675 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -100,5 +100,11 @@ gridApi.core.queueGridRefresh()
 gridApi.core.queueRefresh();
 gridApi.core.registerColumnsProcessor(colProcessor, 100);
 
+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();
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
index 38a7aadbf..f9371fc5c 100644
--- a/ui-grid/ui-grid.d.ts
+++ b/ui-grid/ui-grid.d.ts
@@ -445,7 +445,7 @@ declare module uiGrid {
          * @param {IColumnDef} colDef to make visible
          * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
          */
-        scrollTo(rowEntity: IGridRow, colDef: IColumnDef): ng.IPromise<any>;
+        scrollTo(rowEntity?: any, colDef?: IColumnDef): 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.

From 44b86737dabf2dc8377b355559d2ceced5feada8 Mon Sep 17 00:00:00 2001
From: Dan Lewi Harkestad <dan.lewi.harkestad@kongsberg.com>
Date: Wed, 9 Sep 2015 19:34:04 +0200
Subject: [PATCH 3/3] Changed to single quotes per review feedback.

---
 ui-grid/ui-grid-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
index 4eedf8675..f4bcdce7e 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -100,7 +100,7 @@ gridApi.core.queueGridRefresh()
 gridApi.core.queueRefresh();
 gridApi.core.registerColumnsProcessor(colProcessor, 100);
 
-var rowEntityToScrollTo = {anObject: "inGridOptionsData"};
+var rowEntityToScrollTo = {anObject: 'inGridOptionsData'};
 var columnDefToScrollTo: uiGrid.IColumnDef;
 gridInstance.scrollTo();
 gridInstance.scrollTo(rowEntityToScrollTo);