Changeset 7989

Timestamp:

05/24/2008 05:06:26 PM (17 years ago)

Author:

ryan

Message:

Fixes timing issue in IE6 in the TB mod scripts. Reorders css files to load before js in the admin head. Props azaozz. fixes #7032

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/js/media-upload.js (modified) (2 diffs)
• wp-admin/js/theme-preview.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-header.php

@@ -47 +47 @@
 
 if ( isset($page_hook) ) {
+    do_action('admin_print_styles-' . $page_hook);
     do_action('admin_print_scripts-' . $page_hook);
-    do_action('admin_print_styles-' . $page_hook);
     do_action('admin_head-' . $page_hook);
 } else if ( isset($plugin_page) ) {
+    do_action('admin_print_styles-' . $plugin_page);
     do_action('admin_print_scripts-' . $plugin_page);
-    do_action('admin_print_styles-' . $plugin_page);
     do_action('admin_head-' . $plugin_page);
 } else if ( isset($pagenow) ) {
+    do_action('admin_print_styles-' . $pagenow);
     do_action('admin_print_scripts-' . $pagenow);
-    do_action('admin_print_styles-' . $pagenow);
     do_action('admin_head-' . $pagenow);
 }
+do_action('admin_print_styles');
 do_action('admin_print_scripts');
-do_action('admin_print_styles');
 do_action('admin_head');
 

trunk/wp-admin/js/media-upload.js

@@ -22 +22 @@
             tbWindow.width( W - 50 ).height( H - 45 );
             $('#TB_iframeContent').width( W - 50 ).height( H - 75 );
-            tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px','top':'20px','margin-top':'0'});
+            tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
+            if ( ! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) )
+                tbWindow.css({'top':'20px','margin-top':'0'});
             $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-            if ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) 
-                tbWindow.css({'margin-top':document.documentElement.scrollTop+'px'});
         };
 
@@ -38 +38 @@
 
     $(window).resize( function() { tb_position() } );
-    $(document).ready( function() { tb_position() } );
 });
 

trunk/wp-admin/js/theme-preview.js

@@ -10 +10 @@
 
         if ( tbWindow.size() ) {
-            tbWindow.width( W - 100 ).height( H - 60 );
-            $('#TB_iframeContent').width( W - 100 ).height( H - 90 );
-            tbWindow.css({'margin-left': '-' + parseInt((( W - 100 ) / 2),10) + 'px','top':'30px','margin-top':'0'});
-            if ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) 
-                tbWindow.css({'margin-top':document.documentElement.scrollTop+'px'});
+            tbWindow.width( W - 90 ).height( H - 60 );
+            $('#TB_iframeContent').width( W - 90 ).height( H - 90 );
+            tbWindow.css({'margin-left': '-' + parseInt((( W - 90 ) / 2),10) + 'px'});
+            if ( ! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) )
+                tbWindow.css({'top':'30px','margin-top':'0'});
         };
 
@@ -22 +22 @@
             href = href.replace(/&width=[0-9]+/g, '');
             href = href.replace(/&height=[0-9]+/g, '');
-            $(this).attr( 'href', href + '&width=' + ( W - 100 ) + '&height=' + ( H - 100 ) );
+            $(this).attr( 'href', href + '&width=' + ( W - 110 ) + '&height=' + ( H - 100 ) );
         });
     };

trunk/wp-includes/script-loader.php

@@ -159 +159 @@
         ) );
         $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' ), '20080430' );
+        $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080523' );
         $scripts->localize( 'upload', 'uploadL10n', array(
             'browseTitle' => attribute_escape(__('Browse your files')),
@@ -200 +200 @@
         ));
         
-        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'dimensions' ), '20080515' );
+        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'dimensions' ), '20080523' );
     }
 }