Use appHeader outerHeight for resize calcualtion

This commit is contained in:
Hadi Nategh 2014-12-08 12:24:21 +00:00
parent ee6754b75c
commit 8203d5f695

View File

@ -113,10 +113,10 @@ etemplate2.prototype.resize = function(e)
var appHeader = $j('#divAppboxHeader'); var appHeader = $j('#divAppboxHeader');
//Calculate the excess height //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 // 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; if (typeof e != 'undefined' && e.type !== 'resize') excess_height = 0;