From e97a9d991ebe31473ca814ebd47f729a2b4387a3 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 21 Jan 2019 15:26:57 -0700 Subject: [PATCH] Fix arrow keys in nextmatch do not properly scroll row into view --- api/js/etemplate/et2_dataview_view_container.js | 5 +++++ api/templates/default/etemplate2.css | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/js/etemplate/et2_dataview_view_container.js b/api/js/etemplate/et2_dataview_view_container.js index e03e395c0c..f7007dcb29 100644 --- a/api/js/etemplate/et2_dataview_view_container.js +++ b/api/js/etemplate/et2_dataview_view_container.js @@ -233,6 +233,10 @@ var et2_dataview_container = (function(){ "use strict"; return Class.extend(et2_ { this._height = 0; + // Setting this before measuring height helps with issues getting the + // wrong height due to margins & collapsed borders + this.tr.css('display','block'); + // Increment the height value for each visible container node for (var i = 0; i < this._nodes.length; i++) { @@ -241,6 +245,7 @@ var et2_dataview_container = (function(){ "use strict"; return Class.extend(et2_ this._height += this._nodeHeight(this._nodes[i][0]); } } + this.tr.css('display',''); } return this._height === false ? 0 : this._height; diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css index 9b3c19d7f7..6e2d3b2086 100644 --- a/api/templates/default/etemplate2.css +++ b/api/templates/default/etemplate2.css @@ -1584,9 +1584,6 @@ div.message.floating { .select-cat li{ border-left: 6px solid transparent; } -.et2_nextmatch .egwGridView_grid, .et2_nextmatch .egwGridView_outer { - border-collapse: separate; -} .et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div { margin-left:-6px; margin-right: 2px;