Changeset 7989

Timestamp:

05/24/08 17:06:26 (6 months 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

Files:

• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-admin/js/media-upload.js (modified) (2 diffs)
• trunk/wp-admin/js/theme-preview.js (modified) (2 diffs)
• trunk/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 );
-
+
+
+
-            $('#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() ) {
-10
-10
-100 ) / 2),10) + 'px','top':'30px','margin-top':'0
-$.browser.msie && $.browser.version.substr(0,1) < 7 ) 
-margin-top':document.documentElement.scrollTop+'px
+9
+9
+90 ) / 2),10) + 'px
+! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) )
+top':'30px','margin-top':'0
-        };
-
@@ -22 +22 @@
-            href = href.replace(/&width=[0-9]+/g, '');
-            href = href.replace(/&height=[0-9]+/g, '');
-0
+1
-        });
-    };

trunk/wp-includes/script-loader.php

@@ -159 +159 @@
-        ) );
-        $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080520' );
-430
+523
-        $scripts->localize( 'upload', 'uploadL10n', array(
-            'browseTitle' => attribute_escape(__('Browse your files')),
@@ -200 +200 @@
-        ));
-        
-15
+23
-    }
-}