From: jeresig Date: Fri, 21 Jan 2011 16:22:55 +0000 (-0500) Subject: Merge branch 'fix-7398-frameset-docs' of https://github.com/dmethvin/jquery into... X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=commitdiff_plain;h=1922f311a321620f9df609503f49f41a53671ea4;hp=61e80c55df9231c177d194ff075472898933c2c9 Merge branch 'fix-7398-frameset-docs' of https://github.com/dmethvin/jquery into dmethvin-fix-7398-frameset-docs --- diff --git a/src/support.js b/src/support.js index 7be28fd..4807ce2 100644 --- a/src/support.js +++ b/src/support.js @@ -136,10 +136,16 @@ // Figure out if the W3C box model works as expected // document.body must exist before we can do this jQuery(function() { - var div = document.createElement("div"); - div.style.width = div.style.paddingLeft = "1px"; + var div = document.createElement("div"), + body = document.getElementsByTagName("body")[0]; + + // Frameset documents with no body should not run this code + if ( !body ) { + return; + } - document.body.appendChild( div ); + div.style.width = div.style.paddingLeft = "1px"; + body.appendChild( div ); jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; if ( "zoom" in div.style ) { @@ -178,7 +184,7 @@ jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0; div.innerHTML = ""; - document.body.removeChild( div ).style.display = "none"; + body.removeChild( div ).style.display = "none"; div = tds = null; });