mirror of
https://github.com/DataTables/DataTables.git
synced 2025-03-15 16:29:16 +01:00
Update: Unit tests which text the argument count for fnServerData updated to include oSettings being passed as fourth argument
New: sLoadingRecords tests added for Ajax source loading
This commit is contained in:
parent
e9afa984d4
commit
e08f95f5a2
@ -14,7 +14,7 @@ $(document).ready( function () {
|
|||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
},
|
},
|
||||||
function () { return mPass == 3; }
|
function () { return mPass == 4; }
|
||||||
);
|
);
|
||||||
|
|
||||||
oTest.fnTest(
|
oTest.fnTest(
|
||||||
@ -23,7 +23,7 @@ $(document).ready( function () {
|
|||||||
$('#example').dataTable( {
|
$('#example').dataTable( {
|
||||||
"bDestroy": true,
|
"bDestroy": true,
|
||||||
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = sUrl == "../../../examples/ajax/sources/arrays.txt";
|
mPass = sUrl == "../../../examples/ajax/sources/arrays.txt";
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
@ -37,7 +37,7 @@ $(document).ready( function () {
|
|||||||
$('#example').dataTable( {
|
$('#example').dataTable( {
|
||||||
"bDestroy": true,
|
"bDestroy": true,
|
||||||
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = aoData.length==0;
|
mPass = aoData.length==0;
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
@ -51,7 +51,7 @@ $(document).ready( function () {
|
|||||||
$('#example').dataTable( {
|
$('#example').dataTable( {
|
||||||
"bDestroy": true,
|
"bDestroy": true,
|
||||||
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = typeof fnCallback == 'function';
|
mPass = typeof fnCallback == 'function';
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
@ -0,0 +1,65 @@
|
|||||||
|
// DATA_TEMPLATE: empty_table
|
||||||
|
oTest.fnStart( "oLanguage.sLoadingRecords" );
|
||||||
|
|
||||||
|
$(document).ready( function () {
|
||||||
|
var tmp = false;
|
||||||
|
oTest.fnTest(
|
||||||
|
"Default loading text is 'Loading...'",
|
||||||
|
function () {
|
||||||
|
$('#example').dataTable( {
|
||||||
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt"
|
||||||
|
} );
|
||||||
|
tmp = $('#example tbody tr td')[0].innerHTML == "Loading...";
|
||||||
|
},
|
||||||
|
function () { return tmp; }
|
||||||
|
);
|
||||||
|
|
||||||
|
oTest.fnTest(
|
||||||
|
"Text can be overriden",
|
||||||
|
function () {
|
||||||
|
oSession.fnRestore();
|
||||||
|
$('#example').dataTable( {
|
||||||
|
"oLanguage": {
|
||||||
|
"sLoadingRecords": "unitest"
|
||||||
|
},
|
||||||
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt"
|
||||||
|
} );
|
||||||
|
tmp = $('#example tbody tr td')[0].innerHTML == "unitest";
|
||||||
|
},
|
||||||
|
function () { return tmp; }
|
||||||
|
);
|
||||||
|
|
||||||
|
oTest.fnTest(
|
||||||
|
"When sZeroRecords is given but sLoadingRecords is not, sZeroRecords is used",
|
||||||
|
function () {
|
||||||
|
oSession.fnRestore();
|
||||||
|
$('#example').dataTable( {
|
||||||
|
"oLanguage": {
|
||||||
|
"sZeroRecords": "unitest_sZeroRecords"
|
||||||
|
},
|
||||||
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt"
|
||||||
|
} );
|
||||||
|
tmp = $('#example tbody tr td')[0].innerHTML == "unitest_sZeroRecords";
|
||||||
|
},
|
||||||
|
function () { return tmp; }
|
||||||
|
);
|
||||||
|
|
||||||
|
oTest.fnTest(
|
||||||
|
"sLoadingRecords and sZeroRecords both given",
|
||||||
|
function () {
|
||||||
|
oSession.fnRestore();
|
||||||
|
$('#example').dataTable( {
|
||||||
|
"oLanguage": {
|
||||||
|
"sZeroRecords": "unitest_sZeroRecords2",
|
||||||
|
"sLoadingRecords": "unitest2"
|
||||||
|
},
|
||||||
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt"
|
||||||
|
} );
|
||||||
|
tmp = $('#example tbody tr td')[0].innerHTML == "unitest2";
|
||||||
|
},
|
||||||
|
function () { return tmp; }
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
oTest.fnComplete();
|
||||||
|
} );
|
@ -21,7 +21,7 @@ $(document).ready( function () {
|
|||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
},
|
},
|
||||||
function () { return mPass == 3; }
|
function () { return mPass == 4; }
|
||||||
);
|
);
|
||||||
|
|
||||||
oTest.fnTest(
|
oTest.fnTest(
|
||||||
@ -37,7 +37,7 @@ $(document).ready( function () {
|
|||||||
{ "mDataProp": "version", "aTargets": [3] },
|
{ "mDataProp": "version", "aTargets": [3] },
|
||||||
{ "mDataProp": "grade", "aTargets": [4] }
|
{ "mDataProp": "grade", "aTargets": [4] }
|
||||||
],
|
],
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = sUrl == "../../../examples/ajax/sources/objects.txt";
|
mPass = sUrl == "../../../examples/ajax/sources/objects.txt";
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
@ -58,7 +58,7 @@ $(document).ready( function () {
|
|||||||
{ "mDataProp": "version", "aTargets": [3] },
|
{ "mDataProp": "version", "aTargets": [3] },
|
||||||
{ "mDataProp": "grade", "aTargets": [4] }
|
{ "mDataProp": "grade", "aTargets": [4] }
|
||||||
],
|
],
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = aoData.length==0;
|
mPass = aoData.length==0;
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
@ -79,7 +79,7 @@ $(document).ready( function () {
|
|||||||
{ "mDataProp": "version", "aTargets": [3] },
|
{ "mDataProp": "version", "aTargets": [3] },
|
||||||
{ "mDataProp": "grade", "aTargets": [4] }
|
{ "mDataProp": "grade", "aTargets": [4] }
|
||||||
],
|
],
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = typeof fnCallback == 'function';
|
mPass = typeof fnCallback == 'function';
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
@ -15,7 +15,7 @@ $(document).ready( function () {
|
|||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
},
|
},
|
||||||
function () { return mPass == 3; }
|
function () { return mPass == 4; }
|
||||||
);
|
);
|
||||||
|
|
||||||
oTest.fnTest(
|
oTest.fnTest(
|
||||||
@ -25,7 +25,7 @@ $(document).ready( function () {
|
|||||||
"bDestroy": true,
|
"bDestroy": true,
|
||||||
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
||||||
"bDeferRender": true,
|
"bDeferRender": true,
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = sUrl == "../../../examples/ajax/sources/arrays.txt";
|
mPass = sUrl == "../../../examples/ajax/sources/arrays.txt";
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
@ -40,7 +40,7 @@ $(document).ready( function () {
|
|||||||
"bDestroy": true,
|
"bDestroy": true,
|
||||||
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
||||||
"bDeferRender": true,
|
"bDeferRender": true,
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = aoData.length==0;
|
mPass = aoData.length==0;
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
@ -55,7 +55,7 @@ $(document).ready( function () {
|
|||||||
"bDestroy": true,
|
"bDestroy": true,
|
||||||
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
"sAjaxSource": "../../../examples/ajax/sources/arrays.txt",
|
||||||
"bDeferRender": true,
|
"bDeferRender": true,
|
||||||
"fnServerData": function (sUrl, aoData, fnCallback) {
|
"fnServerData": function (sUrl, aoData, fnCallback, oSettings) {
|
||||||
mPass = typeof fnCallback == 'function';
|
mPass = typeof fnCallback == 'function';
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user