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

Site: DataTables 1.10.0-beta.1 blog post

Browse Source
This commit is contained in:
Allan Jardine 2014-02-10 17:05:35 +00:00
parent 87e0d43844
commit 6c3337e300
3 changed files with 35 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.datatables-commit-sync
View File

@ -1 +1 @@
efedff77e37c7a32cca9710ee7e008968047801e
d214c81afce3a8f594dac5102b473c451162789f

7
media/css/jquery.dataTables.css
View File

@ -354,13 +354,6 @@ table.dataTable td {
*margin-top: -1px;
-webkit-overflow-scrolling: touch;
}
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th > div.dataTables_sizing,
.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td > div.dataTables_sizing {
height: 0;
overflow: hidden;
margin: 0 !important;
padding: 0 !important;
}
.dataTables_wrapper.no-footer .dataTables_scrollBody {
border-bottom: 1px solid #111111;
}

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

@ -1,15 +1,15 @@
/*! DataTables 1.10.0-beta.2.dev
* ©2008-2014 SpryMedia Ltd - datatables.net/license
/*! DataTables 1.10.0-dev
* ©2008-2013 SpryMedia Ltd - datatables.net/license
*/
/**
* @summary DataTables
* @description Paginate, search and order HTML tables
* @version 1.10.0-beta.2.dev
* @version 1.10.0-dev
* @file jquery.dataTables.js
* @author SpryMedia Ltd (www.sprymedia.co.uk)
* @contact www.sprymedia.co.uk/contact
* @copyright Copyright 2008-2014 SpryMedia Ltd.
* @copyright Copyright 2008-2013 SpryMedia Ltd.
*
* This source file is free software, available under the following license:
* MIT license - http://datatables.net/license
@ -2552,33 +2552,27 @@
} )
.append( $('<label/>' ).append( str ) );
var searchFn = function() {
/* Update all other filter input elements for the new display */
var n = features.f;
var val = !this.value ? "" : this.value; // mental IE8 fix :-(
/* Now do the filter */
if ( val != previousSearch.sSearch ) {
_fnFilterComplete( settings, {
"sSearch": val,
"bRegex": previousSearch.bRegex,
"bSmart": previousSearch.bSmart ,
"bCaseInsensitive": previousSearch.bCaseInsensitive
} );
// Need to redraw, without resorting
settings._iDisplayStart = 0;
_fnDraw( settings );
}
};
var jqFilter = $('input[type="search"]', filter)
.val( previousSearch.sSearch.replace('"','&quot;') )
.bind(
'keyup.DT search.DT input.DT paste.DT cut.DT',
_fnDataSource( settings ) === 'ssp' ?
_fnThrottle( searchFn, 400 ):
searchFn
)
.bind( 'keyup.DT search.DT input.DT paste.DT cut.DT', function(e) {
/* Update all other filter input elements for the new display */
var n = features.f;
var val = !this.value ? "" : this.value; // mental IE8 fix :-(
/* Now do the filter */
if ( val != previousSearch.sSearch ) {
_fnFilterComplete( settings, {
"sSearch": val,
"bRegex": previousSearch.bRegex,
"bSmart": previousSearch.bSmart ,
"bCaseInsensitive": previousSearch.bCaseInsensitive
} );
// Need to redraw, without resorting
settings._iDisplayStart = 0;
_fnDraw( settings );
}
} )
.bind( 'keypress.DT', function(e) {
/* Prevent form submission */
if ( e.keyCode == 13 ) {
@ -3504,7 +3498,6 @@
headerSrcEls, footerSrcEls,
headerCopy, footerCopy,
headerWidths=[], footerWidths=[],
headerContent=[],
idx, correction, sanityWidth,
zeroOut = function(nSizer) {
var style = nSizer.style;
@ -3615,7 +3608,6 @@
// Read all widths in next pass
_fnApplyToChildren( function(nSizer) {
headerContent.push( nSizer.innerHTML );
headerWidths.push( _fnStringToCss( $(nSizer).css('width') ) );
}, headerSrcEls );
@ -3647,12 +3639,10 @@
* 3. Apply the measurements
*/
// "Hide" the header and footer that we used for the sizing. We need to keep
// the content of the cell so that the width applied to the header and body
// both match, but we want to hide it completely. We want to also fix their
// width to what they currently are
// "Hide" the header and footer that we used for the sizing. We want to also fix their width
// to what they currently are
_fnApplyToChildren( function(nSizer, i) {
nSizer.innerHTML = '<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+headerContent[i]+'</div>';
nSizer.innerHTML = "";
nSizer.style.width = headerWidths[i];
}, headerSrcEls );
@ -3964,40 +3954,28 @@
}
/**
* Throttle the calls to a function. Arguments and context are maintained for
* the throttled function
* @param {function} fn Function to be called
* @param {int} [freq=200] call frequency in mS
* @returns {function} wrapped function
* @memberof DataTable#oApi
*/
function _fnThrottle( fn, freq ) {
function _fnThrottle( fn ) {
var
frequency = freq || 200,
frequency = 200,
last,
timer;
return function () {
var
that = this,
now = +new Date(),
now = +new Date(),
args = arguments;
if ( last && now < last + frequency ) {
clearTimeout( timer );
timer = setTimeout( function () {
last = undefined;
fn.apply( that, args );
last = now;
fn();
}, frequency );
}
else if ( last ) {
last = now;
fn.apply( that, args );
}
else {
last = now;
fn();
}
};
}
@ -7921,7 +7899,7 @@
}
else {
// Remove column
$( _pluck( settings.aoData, 'anCells', column ) ).detach();
$( _pluck( settings.aoData, 'anCells', column ) ).remove();
col.bVisible = false;
_fnDrawHead( settings, settings.aoHeader );
@ -8674,7 +8652,7 @@
* @type string
* @default Version number
*/
DataTable.version = "1.10.0-beta.2.dev";
DataTable.version = "1.10.0-dev";
/**
* Private data store, containing all of the settings objects that are