mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-23 07:11:28 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36609_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2012-11-26 14:58:13 +13:00
parent 4d9e8469e1 62d210515c
commit 8a423efda9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/javascript-static.js
View File

@@ -340,11 +340,16 @@ M.util.init_maximised_embed = function(Y, id) {
if (Y.Lang.isString(el)) {
el = Y.one('#' + el);
}
var val = el.getStyle(prop);
if (val == 'auto') {
val = el.getComputedStyle(prop);
// Ensure element exists.
if (el) {
var val = el.getStyle(prop);
if (val == 'auto') {
val = el.getComputedStyle(prop);
}
return parseInt(val);
} else {
return 0;
}
return parseInt(val);
};
var resize_object = function() {