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] 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