Merge branch 'wip_MDL-46480_m26_footernan' of git://github.com/skodak/moodle into MOODLE_26_STABLE

2014-08-12 15:02:36 +08:00
parent c750f3de63 8f73f2a160
commit 0faeeeea27
1 changed files with 5 additions and 1 deletions
@@ -346,7 +346,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;
        }