Changeset 7981

Timestamp:

05/22/2008 03:27:28 PM (16 years ago)

Author:

ryan

Message:

Use style loader for gears manifest. Props azaozz. fixes #7015

Location:

trunk

Files:

• wp-admin/gears-manifest.php (modified) (7 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/gears-manifest.php

@@ -2 +2 @@
 
 define( 'ABSPATH', dirname(dirname(__FILE__)) );
+define( 'WPINC', '/wp-includes' );
 
 function __() {}
@@ -9 +10 @@
 function get_option() {}
 function is_lighttpd_before_150() {}
+function add_action() {}
+function do_action_ref_array() {}
+function get_bloginfo() {}
 function is_admin() {return true;}
 
 require(ABSPATH . '/wp-includes/script-loader.php');
+require(ABSPATH . '/wp-includes/version.php');
 
 $wp_scripts = new WP_Scripts();
-
-$default_js = $version = '';
-foreach ( $wp_scripts->scripts as $script ) {
+wp_default_scripts($wp_scripts);
+
+$wp_styles = new WP_Styles();
+wp_default_styles($wp_styles);
+
+$get_lang = file_exists( ABSPATH . '/wp-config.php') ? file( ABSPATH . '/wp-config.php' ) : file( dirname(ABSPATH) . '/wp-config.php' );
+
+if ( is_array($get_lang) ) {
+    foreach ( $get_lang as $val ) {
+        if ( strpos( $val, "'WPLANG'" ) !== false ) {
+            eval( $val );
+            break;
+        }
+    }
+}
+
+if ( defined('WPLANG') && '' != WPLANG ) {
+    if ( file_exists(ABSPATH . '/wp-content/languages') && @is_dir(ABSPATH . '/wp-content/languages') )
+        $langdir = '/wp-content/languages/';
+    else
+        $langdir = '/wp-includes/languages/';
+    
+    $locale_file = ABSPATH . $langdir . WPLANG . '.php';
+    if ( is_readable($locale_file) )
+        include_once($locale_file);
+}
+
+$rtl = ( isset($text_direction) && 'rtl' == $text_direction ) ? true : false;
+
+$defaults = $man_version = '';
+foreach ( $wp_scripts->registered as $script ) {
     if ( empty($script->src) || strpos($script->src, 'tiny_mce_config.php') ) continue;
-    $src = str_replace( '/wp-admin/', '', $script->src );
-    $src = str_replace( '/wp-includes/', '../wp-includes/', $src );
-    $default_js .= '{ "url" : "' . $src . '?ver=' . $script->ver . '" },' . "\n";
-    $version .= $script->ver;
-}
-
-$version = md5($version);
+    $ver = empty($script->ver) ? $wp_version : $script->ver;
+    $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
+    $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+    $man_version .= $ver;
+}
+
+foreach ( $wp_styles->registered as $style ) {
+    if ( empty($style->src) ) continue;
+
+    $ver = empty($style->ver) ? $wp_version : $style->ver;
+    $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
+    if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
+    $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
+
+    if ( $rtl && isset($style->extra['rtl']) && $style->extra['rtl'] ) {
+        if ( is_bool( $style->extra['rtl'] ) )
+            $rtl_href = str_replace( '.css', '-rtl.css', $src );
+        else 
+            $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
+
+        $defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n";
+    }
+    $man_version .= $ver;
+}
+
+$man_version = md5($man_version);
 
 header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
@@ -30 +82 @@
 header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
 header( 'Pragma: no-cache' );
-header( 'Content-Type: application/x-javascript; charset=UTF-8' ); // application/json text/plain ?
+header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 ?>
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $version; ?>_20080520",
+"version" : "<?php echo $man_version; ?>_20080522",
 "entries" : [
-<?php echo $default_js; ?>
-
-{ "url" : "wp-admin.css?version=2.6-bleeding" },
-{ "url" : "rtl.css?version=2.6-bleeding" },
-{ "url" : "../wp-includes/js/thickbox/thickbox.css?version=2.6-bleeding" },
-{ "url" : "css/colors-classic-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/colors-classic.css?version=2.6-bleeding" },
-{ "url" : "css/colors-fresh-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/colors-fresh.css?version=2.6-bleeding" },
-{ "url" : "css/dashboard-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/dashboard.css?version=2.6-bleeding" },
-{ "url" : "css/global.css?version=2.6-bleeding" },
-{ "url" : "css/global-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/ie-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/ie.css?version=2.6-bleeding" },
-{ "url" : "css/install-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/install.css?version=2.6-bleeding" },
-{ "url" : "css/login-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/login.css?version=2.6-bleeding" },
-{ "url" : "css/media-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/media.css?version=2.6-bleeding" },
-{ "url" : "css/press-this.css?version=2.6-bleeding" },
-{ "url" : "css/theme-editor-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/theme-editor.css?version=2.6-bleeding" },
-{ "url" : "css/upload-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/widgets-rtl.css?version=2.6-bleeding" },
-{ "url" : "css/widgets.css?version=2.6-bleeding" },
+<?php echo $defaults; ?>
 
 { "url" : "images/align-center.png" },
@@ -68 +94 @@
 { "url" : "images/align-none.png" },
 { "url" : "images/align-right.png" },
+{ "url" : "images/browse-happy.gif" },
 { "url" : "images/bubble_bg.gif" },
 { "url" : "images/comment-grey-bubble.png" },
@@ -76 +103 @@
 { "url" : "images/date-button.gif" },
 { "url" : "images/fade-butt.png" },
+{ "url" : "images/gear.png" },
 { "url" : "images/logo-ghost.png" },
 { "url" : "images/logo-login.gif" },
+{ "url" : "images/logo.gif" },
 { "url" : "images/media-button-gallery.gif" },
 { "url" : "images/media-button-image.gif" },
@@ -84 +113 @@
 { "url" : "images/media-button-video.gif" },
 { "url" : "images/media-buttons.gif" },
+{ "url" : "images/tab.png" },
 { "url" : "images/tail.gif" },
 { "url" : "images/toggle-arrow-rtl.gif" },
@@ -89 +119 @@
 { "url" : "images/wordpress-logo.png" },
 { "url" : "images/xit.gif" },
+
 { "url" : "../wp-includes/images/crystal/archive.png" },
 { "url" : "../wp-includes/images/crystal/audio.png" },

trunk/wp-includes/general-template.php

@@ -1159 +1159 @@
 }
 
+/**
+ * Enqueues the default ThickBox js and css. 
+ * If any of the settings need to be changed, this can be done with another js file
+ * similar to media-upload.js and theme-preview.js. That file should require array('thickbox')
+ * to ensure it is loaded after. 
+ */
 function add_thickbox() {
     wp_enqueue_script( 'thickbox' );
-    add_action( 'admin_print_scripts', 'add_thickbox_css' );
-}
-
-function add_thickbox_css() {
-    wp_admin_css( 'css/thickbox' );
+    wp_enqueue_style( 'thickbox' );
 }
 

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', false, '20080430' );
+        $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080430' );
         $scripts->localize( 'upload', 'uploadL10n', array(
             'browseTitle' => attribute_escape(__('Browse your files')),