From cdafb417d3f29e8f2c9196e95604d5f10a3a143b Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 20 Feb 2018 10:27:56 -0700 Subject: [PATCH] Etemplate - don't assume event data will still be there after a timeout, fixes occasional errors about it being missing --- api/js/etemplate/et2_dataview_view_grid.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/js/etemplate/et2_dataview_view_grid.js b/api/js/etemplate/et2_dataview_view_grid.js index 43a58fc4ea..7b770f45e0 100644 --- a/api/js/etemplate/et2_dataview_view_grid.js +++ b/api/js/etemplate/et2_dataview_view_grid.js @@ -1357,17 +1357,17 @@ var et2_dataview_grid = (function(){ "use strict"; return et2_dataview_container // Set a new timeout which calls the setViewArea // function - e.data._scrollTimeout = window.setTimeout(function() { + e.data._scrollTimeout = window.setTimeout(jQuery.proxy(function() { var newRange = et2_range( - e.data.scrollarea.scrollTop() - ET2_GRID_VIEW_EXT, - e.data._scrollHeight + ET2_GRID_VIEW_EXT * 2 + this.scrollarea.scrollTop() - ET2_GRID_VIEW_EXT, + this._scrollHeight + ET2_GRID_VIEW_EXT * 2 ); - if (!et2_rangeEqual(newRange, e.data._viewRange)) + if (!et2_rangeEqual(newRange, this._viewRange)) { - e.data.setViewRange(newRange); + this.setViewRange(newRange); } - }, ET2_GRID_SCROLL_TIMEOUT); + },e.data), ET2_GRID_SCROLL_TIMEOUT); }) .height(this._scrollHeight) .appendTo(this.outerCell);