From 8203d5f695bc1b78f442878b2818fe3cc9dfa9e8 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Mon, 8 Dec 2014 12:24:21 +0000 Subject: [PATCH] Use appHeader outerHeight for resize calcualtion --- etemplate/js/etemplate2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js index 78cb3cb54f..cd766ba98b 100644 --- a/etemplate/js/etemplate2.js +++ b/etemplate/js/etemplate2.js @@ -113,10 +113,10 @@ etemplate2.prototype.resize = function(e) var appHeader = $j('#divAppboxHeader'); //Calculate the excess height - var excess_height = egw(window).is_popup()? $j(window).height() - $j('.et2_container').parent().height() - appHeader.outerHeight()+10: false; + var excess_height = egw(window).is_popup()? $j(window).height() - $j('.et2_container').height() - appHeader.outerHeight()+10: false; // Recalculate excess height if the appheader is shown, e.g. mobile framework dialogs - if (appHeader.length > 0 && appHeader.is(':visible')) excess_height -= appHeader.height()-10; + if (appHeader.length > 0 && appHeader.is(':visible')) excess_height -= appHeader.outerHeight()-9; if (typeof e != 'undefined' && e.type !== 'resize') excess_height = 0;