diff --git a/lib/javascript-static.js b/lib/javascript-static.js index f2a746bbba4..e027ee33db4 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -309,7 +309,7 @@ M.util.init_maximised_embed = function(Y, id) { var resize_object = function() { obj.setStyle('width', '0px'); obj.setStyle('height', '0px'); - var newwidth = get_htmlelement_size('content', 'width') - 15; + var newwidth = get_htmlelement_size('maincontent', 'width') - 15; if (newwidth > 600) { obj.setStyle('width', newwidth + 'px'); @@ -320,7 +320,11 @@ M.util.init_maximised_embed = function(Y, id) { var objheight = get_htmlelement_size(obj, 'height'); var newheight = objheight + parseInt(obj.get('winHeight')) - pageheight - 30; if (newheight > 400) { - obj.setStyle('height', newheight + 'px'); + if (newheight > 768) { + obj.setStyle('height', '768px'); + } else { + obj.setStyle('height', newheight + 'px'); + } } else { obj.setStyle('height', '400px'); } diff --git a/lib/resourcelib.php b/lib/resourcelib.php index 0d4aa225273..260008905bd 100644 --- a/lib/resourcelib.php +++ b/lib/resourcelib.php @@ -474,7 +474,7 @@ EOT; EOT; - //$PAGE->requires->js_init_call('M.util.init_maximised_embed', array('resourceobject'), true); + $PAGE->requires->js_init_call('M.util.init_maximised_embed', array('resourceobject'), true); } return $code;