Skip to content

Commit

Permalink
Merge branch 'master' of github.com:DataTables/Scroller
Browse files Browse the repository at this point in the history
  • Loading branch information
Allan Jardine committed Feb 11, 2016
2 parents 97e4ac1 + d5b7c9b commit 74c2139
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions js/dataTables.scroller.js
Expand Up @@ -884,10 +884,12 @@ $.extend( Scroller.prototype, {

// Because of the order of the DT callbacks, the info update will
// take precedence over the one we want here. So a 'thread' break is
// needed
setTimeout( function () {
that._fnInfo.call( that );
}, 0 );
// needed. Only add the thread break if bInfo is set
if ( this.s.dt.oFeatures.bInfo ) {
setTimeout( function () {
that._fnInfo.call( that );
}, 0 );
}

// Hide the loading indicator
if ( this.dom.loader && this.s.loaderVisible ) {
Expand Down

0 comments on commit 74c2139

Please sign in to comment.