From 82695f7730258adb0f292f0853bfc168e3e39b03 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Mon, 19 Nov 2012 15:42:52 +0800 Subject: [PATCH] MDL-36609 javascript: ensure HTML element exists before attempting to perform JS functionality --- lib/javascript-static.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/javascript-static.js b/lib/javascript-static.js index f9b06acfe83..4b47d1d07d9 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -320,11 +320,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() {