From f6fa64f07a3e14a0389a129ee1f1842f6c3bde8a Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Fri, 15 Oct 2010 08:55:24 +0000 Subject: [PATCH] MDL-23617 improved YUI resizing --- lib/javascript-static.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index e027ee33db4..f8831c6a49a 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -316,18 +316,14 @@ M.util.init_maximised_embed = function(Y, id) { } else { obj.setStyle('width', '600px'); } - var pageheight = get_htmlelement_size('page', 'height'); - var objheight = get_htmlelement_size(obj, 'height'); - var newheight = objheight + parseInt(obj.get('winHeight')) - pageheight - 30; - if (newheight > 400) { - if (newheight > 768) { - obj.setStyle('height', '768px'); - } else { - obj.setStyle('height', newheight + 'px'); - } - } else { - obj.setStyle('height', '400px'); + + var headerheight = get_htmlelement_size('page-header', 'height'); + var footerheight = get_htmlelement_size('page-footer', 'height'); + var newheight = parseInt(YAHOO.util.Dom.getViewportHeight()) - footerheight - headerheight - 20; + if (newheight < 400) { + newheight = 400; } + obj.setStyle('height', newheight+'px'); }; resize_object();