From 1b4688cdf3537e4a20fa573cc27bfda5dacb9236 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Sun, 19 May 2013 09:54:46 +0100
Subject: [PATCH] API: Consistency of data return for columns().data()

- The columns().data() method was flattening the returned array. While
  possibly okay on its own, that doesn't match the behaviour of how
  rows().data() works, where each row is an entry in the array, rather
  than the array being flattened. As such I've changed columns().data()
  to work work in the say way, for each column you select, you get an
  entry in the api instance - an array with the data for the that
  column.

- To allow for hte fact that some may want to work with the flattened
  data, I've added a `flatten()` method to the instance base, which is
  basically a shortcut call to `reduce`.
---
 media/src/api/api.base.js    | 8 ++++++++
 media/src/api/api.cells.js   | 4 ++--
 media/src/api/api.columns.js | 2 +-
 media/src/api/api.rows.js    | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/media/src/api/api.base.js b/media/src/api/api.base.js
index 7aed733f..08b0a687 100644
--- a/media/src/api/api.base.js
+++ b/media/src/api/api.base.js
@@ -307,6 +307,14 @@ _Api.prototype = /** @lends DataTables.Api */{
 	},
 
 
+	flatten: function ()
+	{
+		return this.reduce( function ( a, b ) {
+			return a.concat( b );
+		} );
+	},
+
+
 	indexOf: _arrayProto.indexOf || function (obj, start)
 	{
 		for ( var i=(start || 0), ien=this.length ; i<ien ; i++ ) {
diff --git a/media/src/api/api.cells.js b/media/src/api/api.cells.js
index 3f6848be..5e6bf778 100644
--- a/media/src/api/api.cells.js
+++ b/media/src/api/api.cells.js
@@ -36,14 +36,14 @@ _api.register( 'cells()', function ( rowSelector, columnSelector, opts ) {
 
 
 _api.register( 'cells().nodes()', function () {
-	return this.iterator( true, 'cell', function ( settings, row, column ) {
+	return this.iterator( 'cell', function ( settings, row, column ) {
 		return settings.aoData[ row ].anCells[ column ];
 	} );
 } );
 
 
 _api.register( 'cells().data()', function () {
-	return this.iterator( true, 'cell', function ( settings, row, column ) {
+	return this.iterator( 'cell', function ( settings, row, column ) {
 		return _fnGetCellData( settings, row, column );
 	} );
 } );
diff --git a/media/src/api/api.columns.js b/media/src/api/api.columns.js
index 5cc3d034..58c1cc1d 100644
--- a/media/src/api/api.columns.js
+++ b/media/src/api/api.columns.js
@@ -46,7 +46,7 @@ _api.register( 'columns().header()', function ( selector, opts ) {
  *
  */
 _api.register( 'columns().data()', function () {
-	return this.iterator( true, 'column-rows', function ( settings, column, i, j, rows ) {
+	return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) {
 		var a = [];
 		for ( var row=0, ien=rows.length ; row<ien ; row++ ) {
 			a.push( _fnGetCellData( settings, rows[row], column, '' ) );
diff --git a/media/src/api/api.rows.js b/media/src/api/api.rows.js
index d8f59159..81d12bef 100644
--- a/media/src/api/api.rows.js
+++ b/media/src/api/api.rows.js
@@ -51,7 +51,7 @@ _api.register( 'rows().data()', function ( data ) {
 
 
 _api.register( 'rows().invalidate()', function ( src ) {
-	return this.iterator( true, 'row', function ( settings, row ) {
+	return this.iterator( 'row', function ( settings, row ) {
 		_fnInvalidateRow( settings, row, src );
 	} );
 } );
@@ -60,7 +60,7 @@ _api.register( 'rows().invalidate()', function ( src ) {
 _api.register( 'rows().remove()', function () {
 	var that = this;
 
-	return this.iterator( true, 'row', function ( settings, row, thatIdx ) {
+	return this.iterator( 'row', function ( settings, row, thatIdx ) {
 		var data = settings.aoData;
 
 		data.splice( row, 1 );