[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1484-g59f561b

[Marc Delisle]

The branch, master has been updated
       via  59f561b4502f59a6b3387992074c6db4b17f1c15 (commit)
      from  e0c0d21380fab68bf71fbfbdbd060f6f2178c29d (commit)


- Log -----------------------------------------------------------------
commit 59f561b4502f59a6b3387992074c6db4b17f1c15
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Jan 28 13:08:20 2011 -0500

    To fix this jQuery 1.4.4 error:
      tds[0] is undefined
      jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
    
    I merged this commit that is planned to appear in jQuery 1.5:
    https://github.com/dmethvin/jquery/commit/ad0ebf00abca53caaaa46fb172024ba9b23b03a1

-----------------------------------------------------------------------

Summary of changes:
 js/jquery/jquery-1.4.4.js |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/js/jquery/jquery-1.4.4.js b/js/jquery/jquery-1.4.4.js
index a4f1145..a9f2ec7 100644
--- a/js/jquery/jquery-1.4.4.js
+++ b/js/jquery/jquery-1.4.4.js
@@ -1035,10 +1035,16 @@ return (window.jQuery = window.$ = jQuery);
 	// 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];
 
-		document.body.appendChild( div );
+		// Frameset documents with no body should not run this code
+		if ( !body ) {
+		  return;
+		}
+
+		div.style.width = div.style.paddingLeft = "1px";
+		body.appendChild( div );
 		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
 
 		if ( "zoom" in div.style ) {
@@ -1077,7 +1083,7 @@ return (window.jQuery = window.$ = jQuery);
 		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;
 	});
 


hooks/post-receive
-- 
phpMyAdmin