holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stoping requesting more and more rows causing browser to stall, if browser does not give us height for rows (probably because it defered rendering)

Browse Source
This commit is contained in:
Ralf Becker 2015-04-28 16:01:22 +00:00
parent 5efd6c7787
commit 5ec55f9c16
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etemplate/js/et2_dataview_view_grid.js
View File

@ -45,7 +45,7 @@ var ET2_GRID_HOLD_COUNT = 50;
/** /**
* @augments et2_dataview_container * @augments et2_dataview_container
*/ */
var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange, var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
{ {
/** /**
* Creates the grid. * Creates the grid.
@ -253,7 +253,7 @@ var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
/** /**
* The updateTotalCount function can be used to update the total count of * The updateTotalCount function can be used to update the total count of
* rows that are displayed inside the grid. Changing the count always causes * rows that are displayed inside the grid. Changing the count always causes
* the spacer at the bottom (if it exists) to be * the spacer at the bottom (if it exists) to be
* *
* @param _count specifies how many entries the grid can show. * @param _count specifies how many entries the grid can show.
*/ */
@ -425,8 +425,8 @@ var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
} }
} }
// Calculate the average height // Calculate the average height, but only if we have a height
if (avgCount > 0) if (avgCount > 0 && avgSum > 0)
{ {
this._avgHeight = avgSum / avgCount; this._avgHeight = avgSum / avgCount;
this._avgCount = avgCount; this._avgCount = avgCount;
@ -442,7 +442,7 @@ var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
}; };
} }
// Otherwise return the parent average height // Otherwise return the parent average height
if (this._parent) if (this._parent)
{ {
return this._parent.getAvgHeightData(); return this._parent.getAvgHeightData();
@ -490,7 +490,7 @@ var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
{ {
return; return;
} }
var self = this; var self = this;
var _super = this._super; var _super = this._super;
this._invalidateTimeout = window.setTimeout(function() { this._invalidateTimeout = window.setTimeout(function() {
@ -783,7 +783,7 @@ var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
// container index. // container index.
var vtop = Math.max(0, vcr_top); var vtop = Math.max(0, vcr_top);
var idxStart = Math.floor( var idxStart = Math.floor(
Math.min(cidx + ccnt - 1, Math.min(cidx + ccnt - 1,
cidx + (vtop - elemRange.top) / avg, cidx + (vtop - elemRange.top) / avg,
this._total this._total
)); ));
@ -794,7 +794,7 @@ var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
// container index. // container index.
var vbot = Math.max(0, vcr_bot); var vbot = Math.max(0, vcr_bot);
var idxEnd = Math.ceil( var idxEnd = Math.ceil(
Math.min(cidx + ccnt - 1, Math.min(cidx + ccnt - 1,
cidx + (vbot - elemRange.top) / avg, cidx + (vbot - elemRange.top) / avg,
this._total this._total
)); ));
@ -835,7 +835,7 @@ var et2_dataview_grid = et2_dataview_container.extend(et2_dataview_IViewRange,
*/ */
_doInvalidate: function(_super) { _doInvalidate: function(_super) {
if(!this.doInvalidate) return; if(!this.doInvalidate) return;
// Update the pixel positions // Update the pixel positions
this._recalculateElementPosition(); this._recalculateElementPosition();