Skip to content
Browse files

Fix Thickbox positioning for browsers pretending to be IE6, props Den…

…is-de-Bernardy, fixes #8933

git-svn-id: http://svn.automattic.com/wordpress/branches/2.7@10427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 0e23a06 commit 2d4f74d8ef6f3b48d2f562047b5d2d832b7a2edb azaozz committed Jan 24, 2009
Showing with 4 additions and 2 deletions.
  1. +1 −0 wp-includes/js/thickbox/thickbox.css
  2. +2 −1 wp-includes/js/thickbox/thickbox.js
  3. +1 −1 wp-includes/script-loader.php
View
1 wp-includes/js/thickbox/thickbox.css
@@ -33,6 +33,7 @@
.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
.TB_overlayBG {
background-color:#000;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
filter:alpha(opacity=75);
-moz-opacity: 0.75;
opacity: 0.75;
View
3 wp-includes/js/thickbox/thickbox.js
@@ -281,8 +281,9 @@ function tb_remove() {
}
function tb_position() {
+var isIE6 = typeof document.body.style.maxHeight === "undefined";
jQuery("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'});
- if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6
+ if ( ! isIE6 ) { // take away IE6
jQuery("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'});
}
}
View
2 wp-includes/script-loader.php
@@ -103,7 +103,7 @@ function mce_version() {
$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
$scripts->add( 'jquery-hotkeys', '/wp-includes/js/jquery/jquery.hotkeys.js', array('jquery'), '0.0.2' );
$scripts->add( 'jquery-table-hotkeys', '/wp-includes/js/jquery/jquery.table-hotkeys.js', array('jquery', 'jquery-hotkeys'), '20081128' );
- $scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array('jquery'), '3.1-20080430');
+ $scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array('jquery'), '3.1-20090123');
$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.2.0-20081031');
$scripts->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.2.0-20081031');
$scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload'), '2.2.0-20081031');

0 comments on commit 2d4f74d

Please sign in to comment.
Something went wrong with that request. Please try again.