Test for feature instead of browser to fix TB positioning for browsers pretending to be IE6. Props azaozz. fixes #6676
git-svn-id: http://svn.automattic.com/wordpress/trunk@8194 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a16f47dc09
commit
061e9c8097
|
@ -24,7 +24,7 @@ jQuery(function($) {
|
||||||
tbWindow.width( W - 50 ).height( H - 45 );
|
tbWindow.width( W - 50 ).height( H - 45 );
|
||||||
$('#TB_iframeContent').width( W - 50 ).height( H - 75 );
|
$('#TB_iframeContent').width( W - 50 ).height( H - 75 );
|
||||||
tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
|
tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
|
||||||
if ( ! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) )
|
if ( typeof document.body.style.maxWidth != 'undefined' )
|
||||||
tbWindow.css({'top':'20px','margin-top':'0'});
|
tbWindow.css({'top':'20px','margin-top':'0'});
|
||||||
$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
|
$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,7 +12,7 @@ jQuery(function($) {
|
||||||
tbWindow.width( W - 90 ).height( H - 60 );
|
tbWindow.width( W - 90 ).height( H - 60 );
|
||||||
$('#TB_iframeContent').width( W - 90 ).height( H - 90 );
|
$('#TB_iframeContent').width( W - 90 ).height( H - 90 );
|
||||||
tbWindow.css({'margin-left': '-' + parseInt((( W - 90 ) / 2),10) + 'px'});
|
tbWindow.css({'margin-left': '-' + parseInt((( W - 90 ) / 2),10) + 'px'});
|
||||||
if ( ! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) )
|
if ( typeof document.body.style.maxWidth != 'undefined' )
|
||||||
tbWindow.css({'top':'30px','margin-top':'0'});
|
tbWindow.css({'top':'30px','margin-top':'0'});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -159,7 +159,7 @@ function wp_default_scripts( &$scripts ) {
|
||||||
'edit' => __('Edit'),
|
'edit' => __('Edit'),
|
||||||
) );
|
) );
|
||||||
$scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080520' );
|
$scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080520' );
|
||||||
$scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080624' );
|
$scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080625' );
|
||||||
$scripts->localize( 'upload', 'uploadL10n', array(
|
$scripts->localize( 'upload', 'uploadL10n', array(
|
||||||
'browseTitle' => attribute_escape(__('Browse your files')),
|
'browseTitle' => attribute_escape(__('Browse your files')),
|
||||||
'back' => __('« Back'),
|
'back' => __('« Back'),
|
||||||
|
@ -200,7 +200,7 @@ function wp_default_scripts( &$scripts ) {
|
||||||
'error' => __('Error:')
|
'error' => __('Error:')
|
||||||
));
|
));
|
||||||
|
|
||||||
$scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080523' );
|
$scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue