rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00
Code Issues Releases Activity

Fixed: A number of errors jsLint had picked up. Most trivial but worth of note are:

Browse Source 
- Fixed incorrect reference for state saving cookie data string which would cause an error in jQuery 1.3 and before
- Fixed incorrect adding of anti-text selection event listeners being attached to the header elements (to many being added)
This commit is contained in:
Allan Jardine 2010-09-08 21:16:28 +01:00
parent a8ade0297b
commit af9293cbfc
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2792,7 +2792,7 @@
nTh = oSettings.aoColumns[i].nTh; nTh = oSettings.aoColumns[i].nTh;
var nDiv = document.createElement('div'); var nDiv = document.createElement('div');
nDiv.className = oSettings.oClasses.sSortJUIWrapper nDiv.className = oSettings.oClasses.sSortJUIWrapper;
$(nTh).contents().appendTo(nDiv); $(nTh).contents().appendTo(nDiv);
nDiv.appendChild( document.createElement('span') ); nDiv.appendChild( document.createElement('span') );
@ -2801,6 +2801,11 @@
} }
/* Add sort listener */ /* Add sort listener */
var fnNoSelect = function (e) {
this.onselectstart = function() { return false; };
return false;
};
if ( oSettings.oFeatures.bSort ) if ( oSettings.oFeatures.bSort )
{ {
for ( i=0 ; i<oSettings.aoColumns.length ; i++ ) for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
@ -2810,10 +2815,7 @@
_fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i ); _fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
/* Take the brutal approach to cancelling text selection in header */ /* Take the brutal approach to cancelling text selection in header */
$('th', oSettings.nTHead).mousedown( function (e) { $(oSettings.aoColumns[i].nTh).mousedown( fnNoSelect );
this.onselectstart = function() { return false; };
return false;
} );
} }
else else
{ {
@ -4788,7 +4790,7 @@
oSettings.oLanguage.sInfoPostFix; oSettings.oLanguage.sInfoPostFix;
} }
if ( oSettings.oLanguage.fnInfoCallback != null ) if ( oSettings.oLanguage.fnInfoCallback !== null )
{ {
sOut = oSettings.oLanguage.fnInfoCallback( oSettings, iStart, iEnd, iMax, iTotal, sOut ); sOut = oSettings.oLanguage.fnInfoCallback( oSettings, iStart, iEnd, iMax, iTotal, sOut );
} }
@ -5857,12 +5859,12 @@
*/ */
var aParts = window.location.pathname.split('/'); var aParts = window.location.pathname.split('/');
var sNameFile = sName + '_' + aParts.pop().replace(/[\/:]/g,"").toLowerCase(); var sNameFile = sName + '_' + aParts.pop().replace(/[\/:]/g,"").toLowerCase();
var sFullCookie; var sFullCookie, oData;
if ( fnCallback != null ) if ( fnCallback !== null )
{ {
var oData = (typeof $.parseJSON == 'function') ? oData = (typeof $.parseJSON == 'function') ?
$.parseJSON( sValue ) : eval( '('+sData+')' ); $.parseJSON( sValue ) : eval( '('+sValue+')' );
sFullCookie = fnCallback( sNameFile, oData, date.toGMTString(), sFullCookie = fnCallback( sNameFile, oData, date.toGMTString(),
aParts.join('/')+"/" ); aParts.join('/')+"/" );
} }
@ -5875,7 +5877,7 @@
/* Are we going to go over the cookie limit of 4KiB? If so, try to delete a cookies /* Are we going to go over the cookie limit of 4KiB? If so, try to delete a cookies
* belonging to DataTables. This is FAR from bullet proof * belonging to DataTables. This is FAR from bullet proof
*/ */
var sOldName="", iOldTime=9999999999999, oData; var sOldName="", iOldTime=9999999999999;
var iLength = _fnReadCookie( sNameFile )!==null ? document.cookie.length : var iLength = _fnReadCookie( sNameFile )!==null ? document.cookie.length :
sFullCookie.length + document.cookie.length; sFullCookie.length + document.cookie.length;