L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-22338 fixed regression - the embedded resources are being resized again

Browse Source
This commit is contained in:
Petr Skoda
2010-10-06 16:23:37 +00:00
parent ab1f13b783
commit 147fee876e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/javascript-static.js
+6 -2
View File
@@ -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');
}