rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-02-07 05:54:15 +01:00
Code Issues Releases Activity

Fix: Firefox Windows (not Mac) had an error when calculating if scrolling oversizing was needed or not (_fnBrowserDetect). The result was that the table did not fill the space when y-scrolling was enabled and Firefox Windows was used. Fix is to remove the height on the DT_BrowserTest parent as suggested by randomuser - 11406

Browse Source
This commit is contained in:
Allan Jardine 2012-08-22 16:39:36 +01:00
parent 93774f4d7d
commit 34096537c2
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,7 +433,6 @@
} }
/** /**
* Add a data array to the table, creating DOM node etc. This is the parallel to * Add a data array to the table, creating DOM node etc. This is the parallel to
* _fnGatherData, but for adding rows from a Javascript source, rather than a * _fnGatherData, but for adding rows from a Javascript source, rather than a
@ -498,7 +497,7 @@
/* Add to the display array */ /* Add to the display array */
oSettings.aiDisplayMaster.push( iRow ); oSettings.aiDisplayMaster.push( iRow );
/* Create the DOM imformation */ /* Create the DOM information */
if ( !oSettings.oFeatures.bDeferRender ) if ( !oSettings.oFeatures.bDeferRender )
{ {
_fnCreateTr( oSettings, iRow ); _fnCreateTr( oSettings, iRow );
@ -4881,7 +4880,7 @@
*/ */
var n = $( var n = $(
'<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden">'+ '<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden">'+
'<div style="position:absolute; top:1px; left:1px; width:100px; height:50px; overflow:scroll;">'+ '<div style="position:absolute; top:1px; left:1px; width:100px; overflow:scroll;">'+
'<div id="DT_BrowserTest" style="width:100%; height:10px;"></div>'+ '<div id="DT_BrowserTest" style="width:100%; height:10px;"></div>'+
'</div>'+ '</div>'+
'</div>')[0]; '</div>')[0];
@ -5368,7 +5367,7 @@
var nBody = oSettings.nTBody; var nBody = oSettings.nTBody;
var i, iLen; var i, iLen;
bRemove = (bRemove===undefined) ? false : true; bRemove = (bRemove===undefined) ? false : bRemove;
/* Flag to note that the table is currently being destroyed - no action should be taken */ /* Flag to note that the table is currently being destroyed - no action should be taken */
oSettings.bDestroying = true; oSettings.bDestroying = true;
@ -5376,12 +5375,15 @@
/* Fire off the destroy callbacks for plug-ins etc */ /* Fire off the destroy callbacks for plug-ins etc */
_fnCallbackFire( oSettings, "aoDestroyCallback", "destroy", [oSettings] ); _fnCallbackFire( oSettings, "aoDestroyCallback", "destroy", [oSettings] );
/* Restore hidden columns */ /* If the table is not being removed, restore the hidden columns */
for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ ) if ( !bRemove )
{ {
if ( oSettings.aoColumns[i].bVisible === false ) for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
{ {
this.fnSetColumnVis( i, true ); if ( oSettings.aoColumns[i].bVisible === false )
{
this.fnSetColumnVis( i, true );
}
} }
} }
@ -5475,6 +5477,7 @@
/* End it all */ /* End it all */
oSettings = null; oSettings = null;
oInit = null;
}; };
@ -6298,7 +6301,7 @@
var _that = this; var _that = this;
return this.each(function() { this.each(function() {
var i=0, iLen, j, jLen, k, kLen; var i=0, iLen, j, jLen, k, kLen;
var sId = this.getAttribute( 'id' ); var sId = this.getAttribute( 'id' );
@ -6742,6 +6745,8 @@
_fnInitialise( oSettings ); _fnInitialise( oSettings );
} }
} ); } );
_that = null;
return this;
}; };

2
media/src/core/core.support.js
View File

@ -333,7 +333,7 @@ function _fnBrowserDetect( oSettings )
*/ */
var n = $( var n = $(
'<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden">'+ '<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden">'+
'<div style="position:absolute; top:1px; left:1px; width:100px; height:50px; overflow:scroll;">'+ '<div style="position:absolute; top:1px; left:1px; width:100px; overflow:scroll;">'+
'<div id="DT_BrowserTest" style="width:100%; height:10px;"></div>'+ '<div id="DT_BrowserTest" style="width:100%; height:10px;"></div>'+
'</div>'+ '</div>'+
'</div>')[0]; '</div>')[0];