Skip to content

allow for the first row not to be split #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow for the first row not to be split #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 45 additions & 15 deletions js/dataTables.scroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var DataTable = $.fn.dataTable;
* @constructor
* @global
* @param {object} dt DataTables settings object or API instance
* @param {object} [opts={}] Configuration object for Scroller. Options
* @param {object} [opts={}] Configuration object for Scroller. Options
* are defined by {@link Scroller.defaults}
*
* @requires jQuery 1.7+
Expand Down Expand Up @@ -296,7 +296,7 @@ $.extend( Scroller.prototype, {
}

var label = this.dom.label.outerHeight();

heights.xbar = this.dom.scroller.offsetHeight - this.dom.scroller.clientHeight;
heights.labelHeight = label;

Expand All @@ -318,7 +318,7 @@ $.extend( Scroller.prototype, {
*/
pageInfo: function()
{
var
var
dt = this.s.dt,
iScrollTop = this.dom.scroller.scrollTop,
iTotal = dt.fnRecordsDisplay(),
Expand Down Expand Up @@ -558,7 +558,7 @@ $.extend( Scroller.prototype, {
}

this.measure( false );

that.s.stateSaveThrottle = that.s.dt.oApi._fnThrottle( function () {
that.s.dtApi.state.save();
}, 500 );
Expand Down Expand Up @@ -639,7 +639,7 @@ $.extend( Scroller.prototype, {
tbody.append('<tr><td>&#160;</td></tr>');
}
}

$('div.'+dt.oClasses.sScrollBody, container).append( nTable );

// If initialised using `dom`, use the holding element as the insert point
Expand All @@ -654,6 +654,9 @@ $.extend( Scroller.prototype, {

container.appendTo( insertEl );
this.s.heights.row = $('tr', tbody).eq(1).outerHeight();
if (!this.s.allowFirstRowSplit) {
this.s.heights.row = $('tr', tbody).eq(1)[0].getBoundingClientRect().height;
}

container.remove();
},
Expand Down Expand Up @@ -695,6 +698,9 @@ $.extend( Scroller.prototype, {

// Position the table in the virtual scroller
var tableTop = iScrollTop - ((this.s.topRowFloat - displayStart) * heights.row);
if (!this.s.allowFirstRowSplit) {
tableTop = iScrollTop + (iScrollTop % heights.row) - (this.s.topRowFloat - displayStart) * heights.row;
}
if ( displayStart === 0 ) {
tableTop = 0;
}
Expand Down Expand Up @@ -772,7 +778,7 @@ $.extend( Scroller.prototype, {
* had scrolling containers of infinite height (i.e. the absolute value)
*
* @param {string} dir Domain transform direction, `virtualToPhysical` or
* `physicalToVirtual`
* `physicalToVirtual`
* @returns {number} Calculated transform
* @private
*/
Expand Down Expand Up @@ -945,6 +951,24 @@ $.extend( Scroller.prototype, {
0;
},

_updateTableTop: function (displayStart) {
var that = this,
heights = this.s.heights,
iScrollTop = this.dom.scroller.scrollTop,
dispStart = displayStart < 0 ? 0 : displayStart;

if (this.s.allowFirstRowSplit) {
return;
}

this.s.topRowFloat = this.pixelsToRow( iScrollTop, false, true );
var tableTop = iScrollTop + (iScrollTop % heights.row) - (this.s.topRowFloat - dispStart) * heights.row;
setTimeout(function () {
that.dom.table.style.top = tableTop + 'px';
}, 0);
},


/**
* Scrolling function - fired whenever the scrolling position is changed.
* This method needs to use the stored values to see if the table should be
Expand All @@ -962,17 +986,11 @@ $.extend( Scroller.prototype, {
iScrollTop = this.dom.scroller.scrollTop,
iTopRow;

if ( this.s.skip ) {
return;
}

if ( this.s.ingnoreScroll ) {
if ( this.s.skip || this.s.ingnoreScroll || (iScrollTop === this.s.lastScrollTop)) {
this._updateTableTop(this.s.dt._iDisplayStart);
return;
}

if ( iScrollTop === this.s.lastScrollTop ) {
return;
}

/* If the table has been sorted or filtered, then we use the redraw that
* DataTables as done, rather than performing our own
Expand Down Expand Up @@ -1045,6 +1063,7 @@ $.extend( Scroller.prototype, {
var draw = function () {
that.s.dt._iDisplayStart = that.s.targetTop;
that.s.dt.oApi._fnDraw( that.s.dt );
that._updateTableTop(that.s.dt._iDisplayStart);
};

/* Do the DataTables redraw based on the calculated start point - note that when
Expand All @@ -1064,10 +1083,13 @@ $.extend( Scroller.prototype, {
this.dom.loader.css( 'display', 'block' );
this.s.loaderVisible = true;
}
} else {
this._updateTableTop(this.s.dt._iDisplayStart - 1);
}
}
else {
this.s.topRowFloat = this.pixelsToRow( iScrollTop, false, true );
this._updateTableTop(this.s.dt._iDisplayStart - 1);
}

this.s.lastScrollTop = iScrollTop;
Expand Down Expand Up @@ -1186,7 +1208,15 @@ Scroller.defaults = {
* @default 200
* @static
*/
serverWait: 200
serverWait: 200,

/**
* Allow (or not) for the first row to appear as a whole
* @type boolean
* @default true
* @static
*/
allowFirstRowSplit: true
};

Scroller.oDefaults = Scroller.defaults;
Expand Down