Merge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle

This commit is contained in:
Marina Glancy 2014-08-12 15:01:10 +08:00
commit 7c27c681b1

View File

@ -332,7 +332,11 @@ M.util.init_maximised_embed = function(Y, id) {
if (val == 'auto') {
val = el.getComputedStyle(prop);
}
return parseInt(val);
val = parseInt(val);
if (isNaN(val)) {
return 0;
}
return val;
} else {
return 0;
}