Merge branch 'wip_MDL-36499_master' of git://github.com/gjb2048/moodle

This commit is contained in:
Sam Hemelryk 2014-12-09 16:57:03 +13:00
commit 50c1f47ec4

View File

@ -355,7 +355,7 @@ M.util.init_maximised_embed = function(Y, id) {
var headerheight = get_htmlelement_size('page-header', 'height');
var footerheight = get_htmlelement_size('page-footer', 'height');
var newheight = parseInt(Y.one('body').get('winHeight')) - footerheight - headerheight - 100;
var newheight = parseInt(Y.one('body').get('docHeight')) - footerheight - headerheight - 100;
if (newheight < 400) {
newheight = 400;
}