diff --git a/examples/ajax/arrays_subobjects.html b/examples/ajax/arrays_subobjects.html index 7004a5ff..19e96d30 100644 --- a/examples/ajax/arrays_subobjects.html +++ b/examples/ajax/arrays_subobjects.html @@ -19,9 +19,9 @@ "aoColumns": [ null, null, - { "mDataSource": 2 }, - { "mDataSource": "3.version" }, - { "mDataSource": "3.grade" } + { "mDataProp": 2 }, + { "mDataProp": "3.version" }, + { "mDataProp": "3.grade" } ], "fnInitComplete": function () { oTable.fnUpdate( 'AAAA', $('tbody>tr:eq(0)')[0], 4 ); diff --git a/examples/ajax/deep.html b/examples/ajax/deep.html index 8f61666a..6a41c302 100644 --- a/examples/ajax/deep.html +++ b/examples/ajax/deep.html @@ -17,11 +17,11 @@ "bProcessing": true, "sAjaxSource": "sources/deep.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform.inner" }, - { "mDataSource": "platform.details.0" }, - { "mDataSource": "platform.details.1" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform.inner" }, + { "mDataProp": "platform.details.0" }, + { "mDataProp": "platform.details.1" } ] } ); } ); diff --git a/examples/ajax/null_source.html b/examples/ajax/null_source.html index e3844134..10122305 100644 --- a/examples/ajax/null_source.html +++ b/examples/ajax/null_source.html @@ -21,7 +21,7 @@ null, null, null, - { "mDataSource": null } + { "mDataProp": null } ] } ); } ); diff --git a/examples/ajax/objects.html b/examples/ajax/objects.html index 07b4d046..bf64b793 100644 --- a/examples/ajax/objects.html +++ b/examples/ajax/objects.html @@ -17,11 +17,11 @@ "bProcessing": true, "sAjaxSource": "sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); } ); diff --git a/examples/ajax/objects_subarrays.html b/examples/ajax/objects_subarrays.html index 9efe3810..daa9eec7 100644 --- a/examples/ajax/objects_subarrays.html +++ b/examples/ajax/objects_subarrays.html @@ -17,11 +17,11 @@ "bProcessing": true, "sAjaxSource": "sources/objects_subarrays.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "details.0" }, - { "mDataSource": "details.1" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "details.0" }, + { "mDataProp": "details.1" } ], "fnInitComplete": function () { oTable.fnUpdate( 'AAAA', $('tbody>tr:eq(0)')[0], 4 ); diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 5764e3d0..47dd47c7 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -1801,7 +1801,7 @@ * int: - return data object for aoData entry of this index * node(TR): - return data object for this TR element * int:iCol - optional - the column that you want the data of. This will take into - * account mDataSource and return the value DataTables uses for this column + * account mDataProp and return the value DataTables uses for this column */ this.fnGetData = function( mRow, iCol ) { @@ -2521,7 +2521,7 @@ "fnRender": null, "bUseRendered": true, "iDataSort": iCol, - "mDataSource": iCol, + "mDataProp": iCol, "fnGetData": null, "fnSetData": null, "sSortDataType": 'std', @@ -2589,14 +2589,14 @@ _fnMap( oCol, oOptions, "fnRender" ); _fnMap( oCol, oOptions, "bUseRendered" ); _fnMap( oCol, oOptions, "iDataSort" ); - _fnMap( oCol, oOptions, "mDataSource" ); + _fnMap( oCol, oOptions, "mDataProp" ); _fnMap( oCol, oOptions, "asSorting" ); _fnMap( oCol, oOptions, "sSortDataType" ); } /* Cache the data get and set functions for speed */ - oCol.fnGetData = _fnGetObjectDataFn( oCol.mDataSource ); - oCol.fnSetData = _fnSetObjectDataFn( oCol.mDataSource ); + oCol.fnGetData = _fnGetObjectDataFn( oCol.mDataProp ); + oCol.fnSetData = _fnSetObjectDataFn( oCol.mDataProp ); /* Feature sorting overrides column specific when off */ if ( !oSettings.oFeatures.bSort ) @@ -6451,7 +6451,7 @@ { if ( oSettings.iDrawError != oSettings.iDraw ) { - _fnLog( oSettings, 0, "Requested unknown parameter '"+oCol.mDataSource+ + _fnLog( oSettings, 0, "Requested unknown parameter '"+oCol.mDataProp+ "' from the data source for row "+iRow ); oSettings.iDrawError = oSettings.iDraw; return ''; diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_arrays_subobjects.js b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_arrays_subobjects.js index 551112f1..22c127ed 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_arrays_subobjects.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_arrays_subobjects.js @@ -24,9 +24,9 @@ $(document).ready( function () { "aoColumns": [ null, null, - { "mDataSource": 2 }, - { "mDataSource": "3.version" }, - { "mDataSource": "3.grade" } + { "mDataProp": 2 }, + { "mDataProp": "3.version" }, + { "mDataProp": "3.grade" } ], "aaData": [ [ diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_deep.js b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_deep.js index cd8b214c..206f8b1a 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_deep.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_deep.js @@ -22,11 +22,11 @@ oTest.fnTest( $(document).ready( function () { var oInit = { "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform.inner" }, - { "mDataSource": "platform.details.0" }, - { "mDataSource": "platform.details.1" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform.inner" }, + { "mDataProp": "platform.details.0" }, + { "mDataProp": "platform.details.1" } ], "aaData": [ { diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_null_source.js b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_null_source.js index e8bc5cb8..586ff108 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_null_source.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_null_source.js @@ -26,7 +26,7 @@ $(document).ready( function () { null, null, null, - { "mDataSource": null } + { "mDataProp": null } ], "aaData": gaaData }; diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects.js b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects.js index af695feb..af7fcae8 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects.js @@ -22,11 +22,11 @@ oTest.fnTest( $(document).ready( function () { var oInit = { "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaData": [ { diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects_subarrays.js b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects_subarrays.js index f4d263c3..06c40bc3 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects_subarrays.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/_zero_config_objects_subarrays.js @@ -22,11 +22,11 @@ oTest.fnTest( $(document).ready( function () { var oInit = { "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "details.0" }, - { "mDataSource": "details.1" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "details.0" }, + { "mDataProp": "details.1" } ], "aaData": [ { diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aaSorting.js b/media/unit_testing/tests_onhold/5_ajax_objects/aaSorting.js index 17d7b484..e4600f99 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aaSorting.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aaSorting.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -46,11 +46,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['1','asc']] } ); @@ -66,11 +66,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['1','desc']] } ); @@ -86,11 +86,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['1','asc']] } ); @@ -106,11 +106,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['1','desc']] } ); @@ -126,11 +126,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','asc'], ['1','asc']] } ); @@ -145,11 +145,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','asc'], ['1','desc']] } ); @@ -164,11 +164,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','desc'], ['1','asc']] } ); @@ -183,11 +183,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','desc'], ['1','desc']] } ); @@ -203,11 +203,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','asc'], ['3','asc']] } ); @@ -222,11 +222,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','asc'], ['3','desc']] } ); @@ -241,11 +241,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','desc'], ['3','asc']] } ); @@ -260,11 +260,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','desc'], ['3','desc']] } ); @@ -279,11 +279,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSorting": [['0','asc'], ['3','asc'], ['1','asc']] } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aaSortingFixed.js b/media/unit_testing/tests_onhold/5_ajax_objects/aaSortingFixed.js index f899167c..a020d731 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aaSortingFixed.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aaSortingFixed.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -31,11 +31,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSortingFixed": [['0','asc']], "fnInitComplete": function () { @@ -62,11 +62,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "aaSortingFixed": [['3','asc']] } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSearchable.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSearchable.js index 40b87b08..6979926c 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSearchable.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSearchable.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -33,11 +33,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "bSearchable": false }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "bSearchable": false }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); oSettings = oTable.fnSettings(); @@ -59,11 +59,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine", "bSearchable": false }, - { "mDataSource": "browser", "bSearchable": false }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine", "bSearchable": false }, + { "mDataProp": "browser", "bSearchable": false }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); oSettings = oTable.fnSettings(); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSortable.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSortable.js index 0e08035b..8b161456 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSortable.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bSortable.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -28,11 +28,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "bSortable": false }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "bSortable": false }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); $('#example thead th:eq(1)').click(); @@ -62,11 +62,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "bSortable": false }, - { "mDataSource": "platform" }, - { "mDataSource": "version", "bSortable": false }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "bSortable": false }, + { "mDataProp": "platform" }, + { "mDataProp": "version", "bSortable": false }, + { "mDataProp": "grade" } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bUseRendered.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bUseRendered.js index fe36c0fe..421acd26 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bUseRendered.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bUseRendered.js @@ -12,9 +12,9 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, + { "mDataProp": "engine" }, { - "mDataSource": "browser", + "mDataProp": "browser", "fnRender": function (a) { if ( mTmp == 0 ) { mTmp++; @@ -23,9 +23,9 @@ $(document).ready( function () { return a.aData['browser']; } }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -44,9 +44,9 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, + { "mDataProp": "engine" }, { - "mDataSource": "browser", + "mDataProp": "browser", "bUseRendered": false, "fnRender": function (a) { if ( mTmp == 0 ) { @@ -57,9 +57,9 @@ $(document).ready( function () { } } }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); $('#example thead th:eq(1)').click(); @@ -80,7 +80,7 @@ $(document).ready( function () { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ { - "mDataSource": "engine", + "mDataProp": "engine", "fnRender": function (a) { if ( mTmp == 0 ) { mTmp++; @@ -91,7 +91,7 @@ $(document).ready( function () { } }, { - "mDataSource": "browser", + "mDataProp": "browser", "bUseRendered": false, "fnRender": function (a) { if ( mTmp2 == 0 ) { @@ -103,7 +103,7 @@ $(document).ready( function () { } }, { - "mDataSource": "platform", + "mDataProp": "platform", "fnRender": function (a) { if ( mTmp3 == 0 ) { mTmp3++; @@ -113,8 +113,8 @@ $(document).ready( function () { } } }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bVisible.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bVisible.js index a92bbdd0..3ad7c0ab 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bVisible.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.bVisible.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -28,11 +28,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "bVisible": false }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "bVisible": false }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, @@ -83,11 +83,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "bVisible": false }, - { "mDataSource": "platform", "bVisible": false }, - { "mDataSource": "version" }, - { "mDataSource": "grade", "bVisible": false } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "bVisible": false }, + { "mDataProp": "platform", "bVisible": false }, + { "mDataProp": "version" }, + { "mDataProp": "grade", "bVisible": false } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js index 61b62db0..cbb4f3e0 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js @@ -7,17 +7,17 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, + { "mDataProp": "engine" }, { - "mDataSource": "browser", + "mDataProp": "browser", "fnRender": function (a) { mTmp++; return a.aData['browser']; } }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -36,7 +36,7 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, + { "mDataProp": "engine" }, { "fnRender": function (a) { if ( arguments.length != 1 || typeof a.iDataRow=='undefined' || @@ -46,11 +46,11 @@ $(document).ready( function () { } return a.aData['browser']; }, - "mDataSource": "browser" + "mDataProp": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, @@ -65,9 +65,9 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, + { "mDataProp": "engine" }, { - "mDataSource": "browser", + "mDataProp": "browser", "fnRender": function (a) { if ( a.iDataColumn != 1 ) { @@ -76,9 +76,9 @@ $(document).ready( function () { return a.aData['browser']; } }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, @@ -93,9 +93,9 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, + { "mDataProp": "engine" }, { - "mDataSource": "browser", + "mDataProp": "browser", "fnRender": function (a) { if ( a.aData.length != 5 ) { @@ -104,9 +104,9 @@ $(document).ready( function () { return a.aData['browser']; } }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, @@ -120,16 +120,16 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, + { "mDataProp": "engine" }, { - "mDataSource": "browser", + "mDataProp": "browser", "fnRender": function (a) { return 'unittest'; } }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, @@ -143,21 +143,21 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, { - "mDataSource": "platform", + "mDataProp": "platform", "fnRender": function (a) { return 'unittest1'; } }, { - "mDataSource": "version", + "mDataProp": "version", "fnRender": function (a) { return 'unittest2'; } }, - { "mDataSource": "grade" } + { "mDataProp": "grade" } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.iDataSort.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.iDataSort.js index d274f069..7b60e6bb 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.iDataSort.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.iDataSort.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "iDataSort": 4 }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "iDataSort": 4 }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -50,11 +50,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "iDataSort": 4 }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade", "iDataSort": 1 } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "iDataSort": 4 }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade", "iDataSort": 1 } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sClass.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sClass.js index 0523763f..68602ca0 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sClass.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sClass.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -28,11 +28,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform", "sClass": 'unittest' }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform", "sClass": 'unittest' }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, @@ -89,11 +89,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine", "sClass": 'unittest2' }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version", "sClass": 'unittest1' }, - { "mDataSource": "grade" } + { "mDataProp": "engine", "sClass": 'unittest2' }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version", "sClass": 'unittest1' }, + { "mDataProp": "grade" } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sName.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sName.js index 85918be7..00cbd514 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sName.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sName.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version", "sName": 'unit test' }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version", "sName": 'unit test' }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sTitle.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sTitle.js index f5d6b4df..ce18dbba 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sTitle.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sTitle.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -37,11 +37,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "sTitle": 'unit test' }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "sTitle": 'unit test' }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); }, @@ -64,11 +64,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "sTitle": 'unit test 1' }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade", "sTitle": 'unit test 2' } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "sTitle": 'unit test 1' }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade", "sTitle": 'unit test 2' } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sWidth.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sWidth.js index feec54e9..1ade76f5 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sWidth.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.sWidth.js @@ -12,11 +12,11 @@ $(document).ready( function () { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "bAutoWidth": false, "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser", "sWidth": '40%' }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser", "sWidth": '40%' }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -35,11 +35,11 @@ $(document).ready( function () { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "bAutoWidth": false, "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform", "sWidth": '20%' }, - { "mDataSource": "version", "sWidth": '30%' }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform", "sWidth": '20%' }, + { "mDataProp": "version", "sWidth": '30%' }, + { "mDataProp": "grade" } ] } ); }, @@ -59,11 +59,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version", "sWidth": '40%' }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version", "sWidth": '40%' }, + { "mDataProp": "grade" } ] } ); }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoSearchCols.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoSearchCols.js index db159a53..be399178 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoSearchCols.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoSearchCols.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -39,11 +39,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "aoSearchCols": [ null, @@ -64,11 +64,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "aoSearchCols": [ null, @@ -89,11 +89,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "aoSearchCols": [ { "sSearch": ".*ML", "bEscapeRegex": false }, @@ -114,11 +114,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "aoSearchCols": [ { "sSearch": ".*ML", "bEscapeRegex": false }, @@ -139,11 +139,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "aoSearchCols": [ { "sSearch": ".*ML", "bEscapeRegex": false }, diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/asStripClasses.js b/media/unit_testing/tests_onhold/5_ajax_objects/asStripClasses.js index 6ac87806..49e7ed59 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/asStripClasses.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/asStripClasses.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -44,11 +44,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "asStripClasses": [] } ); @@ -74,11 +74,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "asStripClasses": [ 'test1', 'test2' ] } ); @@ -100,11 +100,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "asStripClasses": [ 'test1', 'test2', 'test3', 'test4' ] } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bAutoWidth.js b/media/unit_testing/tests_onhold/5_ajax_objects/bAutoWidth.js index e298bd03..55efdaa4 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bAutoWidth.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bAutoWidth.js @@ -12,11 +12,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -93,11 +93,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bAutoWidth": false } ); @@ -145,11 +145,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bAutoWidth": true } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bFilter.js b/media/unit_testing/tests_onhold/5_ajax_objects/bFilter.js index 1d0f3bab..0ee7573e 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bFilter.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bFilter.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -28,11 +28,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bFilter": false } ); @@ -48,11 +48,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bFilter": true } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bInfo.js b/media/unit_testing/tests_onhold/5_ajax_objects/bInfo.js index 4994fa0d..33d85c3c 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bInfo.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bInfo.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -28,11 +28,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bInfo": false } ); @@ -48,11 +48,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bInfo": true } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bLengthChange.js b/media/unit_testing/tests_onhold/5_ajax_objects/bLengthChange.js index c0d775b9..69fc1b7c 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bLengthChange.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bLengthChange.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -51,11 +51,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bLengthChange": false } ); @@ -78,11 +78,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bLengthChange": true } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bPaginate.js b/media/unit_testing/tests_onhold/5_ajax_objects/bPaginate.js index 196e7c9c..f5225643 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bPaginate.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bPaginate.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -35,11 +35,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bPaginate": false } ); @@ -62,11 +62,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bPaginate": true } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bProcessing.js b/media/unit_testing/tests_onhold/5_ajax_objects/bProcessing.js index 8f2a6e75..77556160 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bProcessing.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bProcessing.js @@ -12,11 +12,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -54,11 +54,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bProcessing": true } ); @@ -99,11 +99,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bProcessing": false } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bServerSide.js b/media/unit_testing/tests_onhold/5_ajax_objects/bServerSide.js index d6e58271..c69f7d45 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bServerSide.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bServerSide.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bSort.js b/media/unit_testing/tests_onhold/5_ajax_objects/bSort.js index c5a42ddb..5a827316 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bSort.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bSort.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -70,11 +70,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bSort": false } ); @@ -102,11 +102,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bSort": true } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/bSortClasses.js b/media/unit_testing/tests_onhold/5_ajax_objects/bSortClasses.js index 58e0d38b..8c00c73b 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/bSortClasses.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/bSortClasses.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -94,11 +94,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bSortClasses": false } ); @@ -136,11 +136,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bSortClasses": true } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/fnDrawCallback.js b/media/unit_testing/tests_onhold/5_ajax_objects/fnDrawCallback.js index 8fd42d28..a6b1725e 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/fnDrawCallback.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/fnDrawCallback.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -35,11 +35,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnDrawCallback": function ( ) { mPass = arguments.length; @@ -62,11 +62,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnDrawCallback": function ( oSettings ) { mPass = oSettings; @@ -91,11 +91,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnDrawCallback": function ( ) { mPass++; diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/fnHeaderCallback.js b/media/unit_testing/tests_onhold/5_ajax_objects/fnHeaderCallback.js index 6a2b1297..0574d5fd 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/fnHeaderCallback.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/fnHeaderCallback.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -33,11 +33,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( ) { mPass = arguments.length; @@ -62,11 +62,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) { mPass++; @@ -93,11 +93,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) { nHead.getElementsByTagName('th')[0].innerHTML = "Displaying "+(iEnd-iStart)+" records"; @@ -117,11 +117,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) { if ( iStart != 0 ) @@ -144,11 +144,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) { if ( iStart == 10 ) @@ -174,11 +174,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) { if ( iEnd == 20 ) @@ -204,11 +204,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) { if ( aiDisplay.length == 57 ) @@ -230,11 +230,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnHeaderCallback": function ( nHead, aasData, iStart, iEnd, aiDisplay ) { if ( aiDisplay.length == 9 ) diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/fnInitComplete.js b/media/unit_testing/tests_onhold/5_ajax_objects/fnInitComplete.js index 290d2525..fdaddd07 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/fnInitComplete.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/fnInitComplete.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -34,11 +34,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnInitComplete": function ( ) { mPass = arguments.length; @@ -57,11 +57,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnInitComplete": function ( oSettings ) { mPass = oSettings; @@ -81,11 +81,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnInitComplete": function ( ) { mPass++; @@ -115,11 +115,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnInitComplete": function ( ) { mPass = $('#example tbody tr').length; diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/fnRowCallback.js b/media/unit_testing/tests_onhold/5_ajax_objects/fnRowCallback.js index 7c863a56..6c5a2f63 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/fnRowCallback.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/fnRowCallback.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -34,11 +34,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnRowCallback": function ( nTr ) { mPass = arguments.length; @@ -59,11 +59,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) { mPass++; @@ -81,11 +81,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) { $(nTr).addClass('unit_test'); @@ -105,11 +105,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) { if ( asData.length != 5 ) @@ -131,11 +131,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnRowCallback": function ( nTr, asData, iDrawIndex, iDataIndex ) { if ( iCount != iDrawIndex ) diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js b/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js index 2f95bfd4..1ae572cb 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js @@ -10,11 +10,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnServerData": function () { mPass = arguments.length; @@ -31,11 +31,11 @@ $(document).ready( function () { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnServerData": function (sUrl, aoData, fnCallback) { mPass = sUrl == "../../../examples/ajax/sources/objects.txt"; @@ -52,11 +52,11 @@ $(document).ready( function () { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnServerData": function (sUrl, aoData, fnCallback) { mPass = aoData.length==0; @@ -73,11 +73,11 @@ $(document).ready( function () { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "fnServerData": function (sUrl, aoData, fnCallback) { mPass = typeof fnCallback == 'function'; diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/iDisplayLength.js b/media/unit_testing/tests_onhold/5_ajax_objects/iDisplayLength.js index 5f1824d1..01facc9a 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/iDisplayLength.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/iDisplayLength.js @@ -6,11 +6,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); @@ -34,11 +34,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "iDisplayLength": 25 } ); @@ -60,11 +60,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "iDisplayLength": 100 } ); @@ -86,11 +86,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "iDisplayLength": 23 } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.oPaginate.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.oPaginate.js index bb74de9d..47abb711 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.oPaginate.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.oPaginate.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "sPaginationType": "full_numbers" } ); @@ -52,11 +52,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sPaginationType": "full_numbers", "oLanguage": { diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfo.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfo.js index 1bd5e4ca..60b234ea 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfo.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfo.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -35,11 +35,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfo": "unit test" @@ -63,11 +63,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfo": "unit _START_ test" @@ -84,11 +84,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfo": "unit _END_ test" @@ -105,11 +105,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfo": "unit _END_ test" @@ -126,11 +126,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfo": "unit _START_ _END_ test" @@ -147,11 +147,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfo": "unit _START_ _END_ _TOTAL_ test" diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js index ead98f60..a98cf5b9 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -40,11 +40,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfoEmpty": "unit test" @@ -75,11 +75,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfoEmpty": "unit _START_ _END_ _TOTAL_ test" diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoPostFix.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoPostFix.js index 2520f003..4c1c7faa 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoPostFix.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoPostFix.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -35,11 +35,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfoPostFix": "unit test" @@ -64,11 +64,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfoPostFix": "unit _START_ _END_ _TOTAL_ test" @@ -86,11 +86,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sInfoPostFix": "unit test" diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sLengthMenu.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sLengthMenu.js index 462b99a0..98712e09 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sLengthMenu.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sLengthMenu.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -47,11 +47,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sLengthMenu": "unit test" @@ -79,11 +79,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sLengthMenu": "unit _MENU_ test" @@ -108,11 +108,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sLengthMenu": "_MENU_" diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sProcessing.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sProcessing.js index 85f4eb8c..71e63620 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sProcessing.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sProcessing.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ], "bProcessing": true } ); @@ -36,11 +36,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "bProcessing": true, "oLanguage": { diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sSearch.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sSearch.js index a81e8e6e..68db5fa5 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sSearch.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sSearch.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -36,11 +36,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sSearch": "unit test" @@ -66,11 +66,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sSearch": "" diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sUrl.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sUrl.js index 4f18ddba..69bbab6d 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sUrl.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sUrl.js @@ -10,11 +10,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -33,11 +33,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sUrl": "../../../examples/examples_support/de_DE.txt" diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sZeroRecords.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sZeroRecords.js index d481c47a..9c63ca1c 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sZeroRecords.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sZeroRecords.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -36,11 +36,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oLanguage": { "sZeroRecords": "unit test" diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oSearch.js b/media/unit_testing/tests_onhold/5_ajax_objects/oSearch.js index 905ac0a4..5d098f67 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oSearch.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oSearch.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -35,11 +35,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oSearch": { "sSearch": "Mozilla" @@ -64,11 +64,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oSearch": { "sSearch": "DS", @@ -86,11 +86,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oSearch": { "sSearch": "Opera", @@ -108,11 +108,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oSearch": { "sSearch": "1.*", @@ -130,11 +130,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "oSearch": { "sSearch": "1.*", diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/sAjaxSource.js b/media/unit_testing/tests_onhold/5_ajax_objects/sAjaxSource.js index 7c428b44..c7c4545b 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/sAjaxSource.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/sAjaxSource.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/sDom.js b/media/unit_testing/tests_onhold/5_ajax_objects/sDom.js index 7b283ea0..40bc1c47 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/sDom.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/sDom.js @@ -8,11 +8,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -53,11 +53,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sDom": '<"wrapper"flipt>' } ); @@ -110,11 +110,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sDom": 'ip>' } ); @@ -167,11 +167,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sDom": 'frtip' } ); @@ -203,11 +203,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sDom": 'lrtip' } ); @@ -241,11 +241,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sDom": 'lfrtp' } ); @@ -277,11 +277,11 @@ $(document).ready( function () { $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sDom": 'lfrti' } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/sPaginationType.js b/media/unit_testing/tests_onhold/5_ajax_objects/sPaginationType.js index f425be5e..69256437 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/sPaginationType.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/sPaginationType.js @@ -6,11 +6,11 @@ $(document).ready( function () { var oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumns": [ - { "mDataSource": "engine" }, - { "mDataSource": "browser" }, - { "mDataSource": "platform" }, - { "mDataSource": "version" }, - { "mDataSource": "grade" } + { "mDataProp": "engine" }, + { "mDataProp": "browser" }, + { "mDataProp": "platform" }, + { "mDataProp": "version" }, + { "mDataProp": "grade" } ] } ); var oSettings = oTable.fnSettings(); @@ -69,11 +69,11 @@ $(document).ready( function () { oTable = $('#example').dataTable( { "sAjaxSource": "../../../examples/ajax/sources/objects.txt", "aoColumnDefs": [ - { "mDataSource": "engine", "aTargets": [0] }, - { "mDataSource": "browser", "aTargets": [1] }, - { "mDataSource": "platform", "aTargets": [2] }, - { "mDataSource": "version", "aTargets": [3] }, - { "mDataSource": "grade", "aTargets": [4] } + { "mDataProp": "engine", "aTargets": [0] }, + { "mDataProp": "browser", "aTargets": [1] }, + { "mDataProp": "platform", "aTargets": [2] }, + { "mDataProp": "version", "aTargets": [3] }, + { "mDataProp": "grade", "aTargets": [4] } ], "sPaginationType": "full_numbers", "fnInitComplete": function () {