From de6482a15e24f8749b00156109e6fc9bb1273719 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Thu, 2 Feb 2012 10:04:51 +0000 Subject: [PATCH] Fix: asStripClasses if given was being overruled by the default given for asStripeClasses - 8332 Fix: The extend function was only extending properties that existed on the original source object, not properties that only existed on the extender --- media/js/jquery.dataTables.js | 6 +++--- media/src/core/core.constructor.js | 2 +- media/src/core/core.support.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index d3935b4b..211b5673 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -4577,9 +4577,9 @@ */ function _fnExtend( oOut, oExtender ) { - for ( var prop in oOut ) + for ( var prop in oExtender ) { - if ( oOut.hasOwnProperty(prop) && oExtender[prop] !== undefined ) + if ( oExtender.hasOwnProperty(prop) ) { if ( typeof oInit[prop] === 'object' && $.isArray(oExtender[prop]) === false ) { @@ -6219,8 +6219,8 @@ _fnMap( oSettings.oScroll, oInit, "bScrollInfinite", "bInfinite" ); _fnMap( oSettings.oScroll, oInit, "iScrollLoadGap", "iLoadGap" ); _fnMap( oSettings.oScroll, oInit, "bScrollAutoCss", "bAutoCss" ); - _fnMap( oSettings, oInit, "asStripClasses", "asStripeClasses" ); // legacy _fnMap( oSettings, oInit, "asStripeClasses" ); + _fnMap( oSettings, oInit, "asStripClasses", "asStripeClasses" ); // legacy _fnMap( oSettings, oInit, "fnServerData" ); _fnMap( oSettings, oInit, "fnFormatNumber" ); _fnMap( oSettings, oInit, "sServerMethod" ); diff --git a/media/src/core/core.constructor.js b/media/src/core/core.constructor.js index 1100d048..70fe21c6 100644 --- a/media/src/core/core.constructor.js +++ b/media/src/core/core.constructor.js @@ -103,8 +103,8 @@ _fnMap( oSettings.oScroll, oInit, "bScrollCollapse", "bCollapse" ); _fnMap( oSettings.oScroll, oInit, "bScrollInfinite", "bInfinite" ); _fnMap( oSettings.oScroll, oInit, "iScrollLoadGap", "iLoadGap" ); _fnMap( oSettings.oScroll, oInit, "bScrollAutoCss", "bAutoCss" ); -_fnMap( oSettings, oInit, "asStripClasses", "asStripeClasses" ); // legacy _fnMap( oSettings, oInit, "asStripeClasses" ); +_fnMap( oSettings, oInit, "asStripClasses", "asStripeClasses" ); // legacy _fnMap( oSettings, oInit, "fnServerData" ); _fnMap( oSettings, oInit, "fnFormatNumber" ); _fnMap( oSettings, oInit, "sServerMethod" ); diff --git a/media/src/core/core.support.js b/media/src/core/core.support.js index 39315577..4757eb6b 100644 --- a/media/src/core/core.support.js +++ b/media/src/core/core.support.js @@ -166,9 +166,9 @@ function _fnMap( oRet, oSrc, sName, sMappedName ) */ function _fnExtend( oOut, oExtender ) { - for ( var prop in oOut ) + for ( var prop in oExtender ) { - if ( oOut.hasOwnProperty(prop) && oExtender[prop] !== undefined ) + if ( oExtender.hasOwnProperty(prop) ) { if ( typeof oInit[prop] === 'object' && $.isArray(oExtender[prop]) === false ) {