From 59c6b530f37e7d59bab644fbb3f437762268fd34 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Sat, 3 Aug 2013 08:06:54 +0100 Subject: [PATCH] Fix: A default for mData would not have been applied - Fix for DataTables/DataTables issue #212 --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 61eed264..dec8eb00 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -5f6a92db1e86a9bd89f2bd2247e8882dabc1b3d8 +9a8be62411b197d5b425d2867c0e20035cd5c11c diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 816368dd..a64d1554 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -222,7 +222,7 @@ "nTh": nTh ? nTh : document.createElement('th'), "sTitle": oDefaults.sTitle ? oDefaults.sTitle : nTh ? nTh.innerHTML : '', "aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol], - "mData": oDefaults.mData ? oDefaults.oDefaults : iCol + "mData": oDefaults.mData ? oDefaults.mData : iCol } ); oSettings.aoColumns.push( oCol ); @@ -13533,8 +13533,7 @@ return a.toLowerCase(); }, - // string-asc and -desc are retained only for compatibility with the old - // sort methods + // string-asc and -desc are retained only for compatibility with "string-asc": function ( x, y ) { return ((x < y) ? -1 : ((x > y) ? 1 : 0)); @@ -13606,17 +13605,6 @@ } ] ); - // date - // numeric (inc. formatted) - // html numbers (inc. formatted) - // html - - - - - - add sort types (currency, html numbers, formatted numbers, formatted html numbers) - currency is just formatted numbers // Filter formatting functions. See model.ext.ofnSearch for information about