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

Update version number to 1.8.0.dev.2 for beta 2 development work

Browse Source 
Fix: Call fnRender only once when using using bUseRendered (don't need to call it twice since our internal data cache already has the rendered value stored) sin
ce this can cause some confusion with re-writing the data source value - 4871
This commit is contained in:
Allan Jardine 2011-05-02 22:32:54 +01:00
parent 68667a0ee9
commit 2c8868dd53
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/*
* File: jquery.dataTables.js
* Version: 1.8.0.beta.1
* Version: 1.8.0.dev.2
* Description: Paginate, search and sort HTML tables
* Author: Allan Jardine (www.sprymedia.co.uk)
* Created: 28/3/2008
@ -67,7 +67,7 @@
* Notes: Allowed format is a.b.c.d.e where:
* a:int, b:int, c:int, d:string(dev|beta), e:int. d and e are optional
*/
_oExt.sVersion = "1.8.0.beta.1";
_oExt.sVersion = "1.8.0.dev.2";
/*
* Variable: sErrMode
@ -2733,8 +2733,10 @@
var oCol = oSettings.aoColumns[i];
nTd = document.createElement('td');
/* Render if needed */
if ( typeof oCol.fnRender == 'function' )
/* Render if needed - if bUseRendered is true then we already have the rendered
* value in the data source - so can just use that
*/
if ( typeof oCol.fnRender == 'function' && !oCol.bUseRendered )
{
nTd.innerHTML = oCol.fnRender( {
"iDataRow": iRow,

2
media/unit_testing/tests_onhold/3_ajax/aoColumns.fnRender.js
View File

@ -22,7 +22,7 @@ $(document).ready( function () {
oTest.fnWaitTest(
"Single column - fnRender is called twice for each row",
null,
function () { return mTmp == 114; }
function () { return mTmp == 57; }
);
oTest.fnWaitTest(

4
media/unit_testing/tests_onhold/4_server-side/aoColumns.fnRender.js
View File

@ -21,9 +21,9 @@ $(document).ready( function () {
var oSettings = oTable.fnSettings();
oTest.fnWaitTest(
"Single column - fnRender is called twice for each row",
"Single column - fnRender is called once for each row",
null,
function () { return mTmp == 20; }
function () { return mTmp == 10; }
);
oTest.fnWaitTest(

2
media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js
View File

@ -25,7 +25,7 @@ $(document).ready( function () {
oTest.fnWaitTest(
"Single column - fnRender is called twice for each row",
null,
function () { return mTmp == 114; }
function () { return mTmp == 57; }
);
oTest.fnWaitTest(

4
media/unit_testing/tests_onhold/6_delayed_rendering/aoColumns.fnRender.js
View File

@ -21,9 +21,9 @@ $(document).ready( function () {
var oSettings = oTable.fnSettings();
oTest.fnWaitTest(
"Single column - fnRender is called once for each row, plus once for the node draw",
"Single column - fnRender is called once for each row",
null,
function () { return mTmp == 67; }
function () { return mTmp == 57; }
);
oTest.fnWaitTest(