From 39828e8bab4aac2f8648df9aba486d6b1fb7a4c1 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Tue, 4 Mar 2014 08:52:53 +0000 Subject: [PATCH] Fix: Incorrect use of offsetHeight for scroll collapse --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index f354046c..7f839c5b 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -dbd08731ff5017c85be08d79d7c764bcea02c64a +6e5c2b6800f6a3014f33455491f2186cf00b0b82 diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index da6a4e82..6768176f 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -3561,7 +3561,7 @@ // will end up forcing the scrollbar to appear, making our measurements wrong for when we // then hide it (end of this function), so add the header height to the body scroller. if ( scroll.bCollapse && scrollY !== "" ) { - divBodyStyle.height = (divBody.offsetHeight + header[0].offsetHeight)+"px"; + divBodyStyle.height = (divBody[0].offsetHeight + header[0].offsetHeight)+"px"; } // Size the table as a whole