rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Allan Jardine 2014-01-05 11:18:18 +00:00
parent b3bd3cbda7
commit 0b2c32c98f
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.datatables-commit-sync
View File

@ -1 +1 @@
4e5a0aee5316508870d05d64e9dbacd3ef289441
23e7a8a3c3e386567adf2ea3a4e454a4ca7ff2f1

34
media/js/jquery.dataTables.js vendored
View File

@ -8377,30 +8377,30 @@
/**
* Check if a `<table>` node is a DataTable table already or not.
*
* @param {node} table The `table` node to check if it is a DataTable or not
* (note that other node types can be passed in, but will always return
* false).
* @param {node|jquery|string} table Table node, jQuery object or jQuery
* selector for the table to test. Note that if more than more than one
* table is passed on, only the first will be checked
* @returns {boolean} true the table given is a DataTable, or false otherwise
* @static
* @dtopt API-Static
*
* @example
* var ex = document.getElementById('example');
* if ( ! $.fn.DataTable.isDataTable( ex ) ) {
* $(ex).dataTable();
* if ( ! $.fn.DataTable.isDataTable( '#example' ) ) {
* $('#example').dataTable();
* }
*/
DataTable.isDataTable = DataTable.fnIsDataTable = function ( table )
{
var o = DataTable.settings;
var t = $(table).get(0);
var is = false;
for ( var i=0 ; i<o.length ; i++ ) {
if ( o[i].nTable === table || o[i].nScrollHead === table || o[i].nScrollFoot === table ) {
return true;
$.each( DataTable.settings, function (i, o) {
if ( o.nTable === t || o.nScrollHead === t || o.nScrollFoot === t ) {
is = true;
}
}
} );
return false;
return is;
};
@ -8422,15 +8422,11 @@
*/
DataTable.tables = DataTable.fnTables = function ( visible )
{
var out = [];
jQuery.each( DataTable.settings, function (i, o) {
if ( !visible || (visible === true && $(o.nTable).is(':visible')) ) {
out.push( o.nTable );
return jQuery.map( DataTable.settings, function (o) {
if ( !visible || (visible && $(o.nTable).is(':visible')) ) {
return o.nTable;
}
} );
return out;
};