1
0
mirror of https://github.com/DataTables/DataTables.git synced 2025-03-15 16:29:16 +01:00

Merge branch 'master' of github.com:DataTables/DataTablesSrc

This commit is contained in:
Allan Jardine 2014-03-19 10:53:44 +00:00
parent ecceb7a2ca
commit d271fac5b6
2 changed files with 2 additions and 2 deletions

View File

@ -1 +1 @@
5163edd378fd86020a43a1b5a21ed8732bd92990
2380313b30b913d6909d88166fc77746a019e717

View File

@ -2291,7 +2291,7 @@
if ( error == "parsererror" ) {
log( oSettings, 0, 'Invalid JSON response', 1 );
}
else {
else if ( xhr.readyState === 4 ) {
log( oSettings, 0, 'Ajax error', 7 );
}