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

New - licensing: DataTables is now available under the MIT license

Browse Source 
- Full license available here: http://datatables.net/license_mit

- Note that this effectively makes the BSD and GPLv2 licenses that
  DataTables is also available under redundant since the MIT is the most
  relaxed of these licenses. At some point in the not too distant
  future, it would make sense to remove these two licenses and have
  DataTables available under only the MIT license.
This commit is contained in:
Allan Jardine 2013-03-15 09:56:27 +00:00
parent 65b6e2f901
commit baa16632ec
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,12 +6,12 @@
* @author Allan Jardine (www.sprymedia.co.uk) * @author Allan Jardine (www.sprymedia.co.uk)
* @contact www.sprymedia.co.uk/contact * @contact www.sprymedia.co.uk/contact
* *
* @copyright Copyright 2008-2012 Allan Jardine, all rights reserved. * @copyright Copyright 2008-2013 Allan Jardine.
* *
* This source file is free software, under either the GPL v2 license or a * This source file is free software, available under the following licenses:
* BSD style license, available at: * GPL v2 license - http://datatables.net/license_gpl2
* http://datatables.net/license_gpl2 * BSD (3 point) license - http://datatables.net/license_bsd
* http://datatables.net/license_bsd * MIT license - http://datatables.net/license_mit
* *
* This source file is distributed in the hope that it will be useful, but * This source file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@ -2155,12 +2155,12 @@
function _fnFeatureHtmlFilter ( oSettings ) function _fnFeatureHtmlFilter ( oSettings )
{ {
var oPreviousSearch = oSettings.oPreviousSearch; var oPreviousSearch = oSettings.oPreviousSearch;
var sSearchStr = oSettings.oLanguage.sSearch; var sSearchStr = oSettings.oLanguage.sSearch;
sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ? sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ?
sSearchStr.replace('_INPUT_', '<input type="search" />') : sSearchStr.replace('_INPUT_', '<input type="search" />') :
sSearchStr==="" ? '<input type="search" />' : sSearchStr+' <input type="search" />'; sSearchStr==="" ? '<input type="search" />' : sSearchStr+' <input type="search" />';
var nFilter = document.createElement( 'div' ); var nFilter = document.createElement( 'div' );
nFilter.className = oSettings.oClasses.sFilter; nFilter.className = oSettings.oClasses.sFilter;
nFilter.innerHTML = '<label>'+sSearchStr+'</label>'; nFilter.innerHTML = '<label>'+sSearchStr+'</label>';
@ -2168,19 +2168,19 @@
{ {
nFilter.id = oSettings.sTableId+'_filter'; nFilter.id = oSettings.sTableId+'_filter';
} }
var jqFilter = $('input[type="search"]', nFilter); var jqFilter = $('input[type="search"]', nFilter);
// Store a reference to the input element, so other input elements could be // Store a reference to the input element, so other input elements could be
// added to the filter wrapper if needed (submit button for example) // added to the filter wrapper if needed (submit button for example)
nFilter._DT_Input = jqFilter[0]; nFilter._DT_Input = jqFilter[0];
jqFilter.val( oPreviousSearch.sSearch.replace('"','&quot;') ); jqFilter.val( oPreviousSearch.sSearch.replace('"','&quot;') );
jqFilter.bind( 'keyup.DT search.DT', function(e) { jqFilter.bind( 'keyup.DT search.DT', function(e) {
/* Update all other filter input elements for the new display */ /* Update all other filter input elements for the new display */
var n = oSettings.aanFeatures.f; var n = oSettings.aanFeatures.f;
var val = this.value==="" ? "" : this.value; // mental IE8 fix :-( var val = this.value==="" ? "" : this.value; // mental IE8 fix :-(
for ( var i=0, iLen=n.length ; i<iLen ; i++ ) for ( var i=0, iLen=n.length ; i<iLen ; i++ )
{ {
if ( n[i] != $(this).parents('div.dataTables_filter')[0] ) if ( n[i] != $(this).parents('div.dataTables_filter')[0] )
@ -2188,7 +2188,7 @@
$(n[i]._DT_Input).val( val ); $(n[i]._DT_Input).val( val );
} }
} }
/* Now do the filter */ /* Now do the filter */
if ( val != oPreviousSearch.sSearch ) if ( val != oPreviousSearch.sSearch )
{ {
@ -2200,7 +2200,7 @@
} ); } );
} }
} ); } );
jqFilter jqFilter
.attr('aria-controls', oSettings.sTableId) .attr('aria-controls', oSettings.sTableId)
.bind( 'keypress.DT', function(e) { .bind( 'keypress.DT', function(e) {
@ -2211,7 +2211,7 @@
} }
} }
); );
return nFilter; return nFilter;
} }
@ -3827,6 +3827,15 @@
if ( widthAttr ) if ( widthAttr )
{ {
oSettings.nTable.style.width = _fnStringToCss( widthAttr ); oSettings.nTable.style.width = _fnStringToCss( widthAttr );
if ( ! oSettings._attachedResizing &&
(oSettings.oScroll.sY !== '' || oSettings.oScroll.sX !== '') )
{
$(window).bind('resize.DT-'+oSettings.sInstance, function () {
_fnScrollDraw( oSettings );
} );
oSettings._attachedResizing = true;
}
} }
} }
@ -5368,6 +5377,7 @@
/* Blitz all DT events */ /* Blitz all DT events */
$(oSettings.nTableWrapper).unbind('.DT').find('*').unbind('.DT'); $(oSettings.nTableWrapper).unbind('.DT').find('*').unbind('.DT');
$(window).unbind('.DT-'+oSettings.sInstance);
/* If there is an 'empty' indicator row, remove it */ /* If there is an 'empty' indicator row, remove it */
$('tbody>tr>td.'+oSettings.oClasses.sRowEmpty, oSettings.nTable).parent().remove(); $('tbody>tr>td.'+oSettings.oClasses.sRowEmpty, oSettings.nTable).parent().remove();

10
media/src/DataTables.js
View File

@ -6,12 +6,12 @@
* @author Allan Jardine (www.sprymedia.co.uk) * @author Allan Jardine (www.sprymedia.co.uk)
* @contact www.sprymedia.co.uk/contact * @contact www.sprymedia.co.uk/contact
* *
* @copyright Copyright 2008-2012 Allan Jardine, all rights reserved. * @copyright Copyright 2008-2013 Allan Jardine.
* *
* This source file is free software, under either the GPL v2 license or a * This source file is free software, available under the following licenses:
* BSD style license, available at: * GPL v2 license - http://datatables.net/license_gpl2
* http://datatables.net/license_gpl2 * BSD (3 point) license - http://datatables.net/license_bsd
* http://datatables.net/license_bsd * MIT license - http://datatables.net/license_mit
* *
* This source file is distributed in the hope that it will be useful, but * This source file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY