From 34c18509d812929535ae78972cc531f4d4d7203f Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Fri, 7 Mar 2014 11:46:08 +0000
Subject: [PATCH] Update: The `_` option for columns.render as an object is
optional now
- Previously when using columns.render as an object, you had to supply
an `_` option which was the fallback. However, I've now made it so
that if there is no `_` option it will just use the raw data from
`columns.data`
---
.datatables-commit-sync | 2 +-
media/js/jquery.dataTables.js | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.datatables-commit-sync b/.datatables-commit-sync
index c88a4cf1..46d0ac20 100644
--- a/.datatables-commit-sync
+++ b/.datatables-commit-sync
@@ -1 +1 @@
-dfdf6371182e92cc53cdac96a01ae9316c30702b
+a7e482203d8a79d537f2bcffba763f852af12ce3
diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index 47ae52f6..11fc4215 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -1091,7 +1091,10 @@
} );
return function (data, type, extra) {
- return o[ o[type] !== undefined ? type : '_' ](data, type, extra);
+ var t = o[type] || o._;
+ return t !== undefined ?
+ t(data, type, extra) :
+ data;
};
}
else if ( mSource === null )