Changeset 6789

Timestamp:

02/11/2008 05:45:18 PM (16 years ago)

Author:

ryan

Message:

New gzip compressor for TinyMCE from azaozz. fixes #5807

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (2 diffs)
• functions.php (modified) (1 diff)
• js/tinymce/tiny_mce_config.php (modified) (1 diff)
• js/tinymce/tiny_mce_gzip.php (modified) (1 diff)
• script-loader.php (modified) (2 diffs)

trunk/wp-includes/default-filters.php

@@ -144 +144 @@
 add_filter('option_home', '_config_wp_home');
 add_filter('option_siteurl', '_config_wp_siteurl');
-add_filter('mce_plugins', '_mce_load_rtl_plugin');
-add_filter('mce_buttons', '_mce_add_direction_buttons');
+add_filter('tiny_mce_before_init', '_mce_set_direction');
 add_filter('pre_kses', 'wp_pre_kses_less_than');
 add_filter('sanitize_title', 'sanitize_title_with_dashes');
@@ -174 +173 @@
 add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
 add_action('admin_print_scripts', 'wp_print_scripts', 20);
-add_action('mce_options', '_mce_set_direction');
 add_action('init', 'smilies_init', 5);
 add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );

trunk/wp-includes/functions.php

@@ -1383 +1383 @@
 
 
-function _mce_set_direction() {
+function _mce_set_direction( $input ) {
     global $wp_locale;
 
     if ( 'rtl' == $wp_locale->text_direction ) {
-        echo 'directionality : "rtl" ,';
-        echo 'theme_advanced_toolbar_align : "right" ,';
-    }
-}
-
-
-function _mce_load_rtl_plugin( $input ) {
-    global $wp_locale;
-
-    if ( 'rtl' == $wp_locale->text_direction )
-        $input[] = 'directionality';
-
-    return $input;
-}
-
-
-function _mce_add_direction_buttons( $input ) {
-    global $wp_locale;
-
-    if ( 'rtl' == $wp_locale->text_direction ) {
-        $new_buttons = array( 'separator', 'ltr', 'rtl' );
-        $input = array_merge( $input, $new_buttons );
+        $input['directionality'] = 'rtl';
+        $input['theme_advanced_toolbar_align'] = 'right';
+        $input['plugins'] .= ',directionality';
+        $input['theme_advanced_buttons2'] .= ',|,ltr,rtl';
     }
 

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -1 @@
-<?php
-    @ require('../../../wp-config.php');
-    cache_javascript_headers();
-
-    // deprecated
-    function wp_translate_tinymce_lang($text) {
-        if ( ! function_exists('__') ) {
-            return $text;
-        } else {
-            $search1 = "/^tinyMCELang\\[(['\"])(.*)\\1\]( ?= ?)(['\"])(.*)\\4/Uem";
-            $replace1 = "'tinyMCELang[\\1\\2\\1]\\3'.stripslashes('\\4').__('\\5').stripslashes('\\4')";
-
-            $search2 = "/ : (['\"])(.*)\\1/Uem";
-            $replace2 = "' : '.stripslashes('\\1').__('\\2').stripslashes('\\1')";
-
-            $search = array($search1, $search2);
-            $replace = array($replace1, $replace2);
-
-            $text = preg_replace($search, $replace, $text);
-
-            return $text;
+<?php 
+// some code below is from:
+/**
+ * $Id: tiny_mce_gzip.php 315 2007-10-25 14:03:43Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2005-2006, Moxiecode Systems AB, All rights reserved.
+ *
+ * This file compresses the TinyMCE JavaScript using GZip.
+ **/
+  
+@ require('../../../wp-config.php');
+
+function getFileContents($path) {
+    $path = realpath($path);
+
+    if ( ! $path || ! @is_file($path) )
+        return '';
+
+    if ( function_exists('file_get_contents') )
+        return @file_get_contents($path);
+
+    $content = '';
+    $fp = @fopen($path, 'r');
+    if ( ! $fp )
+        return '';
+
+    while ( ! feof($fp) )
+        $content .= fgets($fp);
+
+    fclose($fp);
+    return $content;
+}
+
+function putFileContents( $path, $content ) {
+    if ( function_exists('file_put_contents') )
+        return @file_put_contents( $path, $content );
+
+    $fp = @fopen( $path, 'wb' );
+    if ($fp) {
+        fwrite( $fp, $content );
+        fclose($fp);
+    }
+}
+
+// Set up init variables
+$https = ( isset($_SERVER['HTTPS']) && 'on' == $_SERVER['HTTPS'] ) ? true : false;
+    
+$baseurl = get_option('siteurl') . '/wp-includes/js/tinymce';
+$baseurl = $https ? str_replace('http://', 'https://', $baseurl) : $baseurl;
+
+$mce_css = $baseurl . '/wordpress.css';
+$mce_css = apply_filters('mce_css', $mce_css);
+$mce_css = $https ? str_replace('http://', 'https://', $mce_css) : $mce_css;
+
+$valid_elements = '*[*]';
+$valid_elements = apply_filters('mce_valid_elements', $valid_elements);
+    
+$invalid_elements = apply_filters('mce_invalid_elements', '');
+
+$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen' );
+
+/* 
+The following filter takes an associative array of external plugins for TinyMCE in the form "name" => "url".
+It adds the plugin's name (including the required dash) to TinyMCE's plugins init and the call to PluginManager to load the plugin. 
+The url should be absolute and should include the js file name to be loaded. 
+Example: array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' ). 
+If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
+*/
+$mce_external_plugins = apply_filters('mce_external_plugins', array()); 
+
+$ext_plugins = "\n";
+foreach ( $mce_external_plugins as $name => $url ) {
+    $plugins[] = '-' . $name;
+    $url = $https ? str_replace('http://', 'https://', $url) : $url;
+    
+    $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
+}
+
+$plugins = implode($plugins, ',');
+
+$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'outdent', 'indent', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', '|', 'wp_help', 'wp_adv' ));
+$mce_buttons = implode($mce_buttons, ',');
+
+$mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', '|', 'removeformat', 'cleanup', '|', 'media', 'charmap', 'blockquote', '|', 'undo', 'redo', 'fullscreen' ));
+$mce_buttons_2 = implode($mce_buttons_2, ',');
+
+$mce_buttons_3 = apply_filters('mce_buttons_3', array());
+$mce_buttons_3 = implode($mce_buttons_3, ',');
+    
+$mce_buttons_4 = apply_filters('mce_buttons_4', array());
+$mce_buttons_4 = implode($mce_buttons_4, ',');
+
+// all these browsers are now 100% supported, no need for this
+//$mce_browsers = apply_filters('mce_browsers', array('msie', 'gecko', 'opera', 'safari'));
+//$mce_browsers = implode($mce_browsers, ',');
+
+$mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
+
+// TinyMCE init settings
+$initArray = array (
+    'mode' => 'none',
+    'onpageload' => 'wpEditorInit',
+    'width' => '100%',
+    'theme' => 'advanced',
+    'skin' => 'wp_theme',
+    'theme_advanced_buttons1' => "$mce_buttons",
+    'theme_advanced_buttons2' => "$mce_buttons_2",
+    'theme_advanced_buttons3' => "$mce_buttons_3",
+    'theme_advanced_buttons4' => "$mce_buttons_4",
+    'language' => "$mce_locale",
+    'theme_advanced_toolbar_location' => 'top',
+    'theme_advanced_toolbar_align' => 'left',
+    'theme_advanced_statusbar_location' => 'bottom',
+    'theme_advanced_resizing' => true,
+    'theme_advanced_resize_horizontal' => false,
+//  'browsers' => "$mce_browsers",
+    'dialog_type' => 'modal',
+    'convert_urls' => false,
+    'relative_urls' => false,
+    'remove_script_host' => false,
+    'fix_list_elements' => true,
+    'fix_table_elements' => true,
+    'gecko_spellcheck' => true,
+    'entities' => '38,amp,60,lt,62,gt',
+    'accessibility_focus' => false,
+    'tab_focus' => ':next',
+    'content_css' => "$mce_css",
+    'save_callback' => 'switchEditors.saveCallback',
+    'plugins' => "$plugins",
+    // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
+    'disk_cache' => true,
+    'compress' => true,
+    'del_old_cache' => true
+);
+
+if ( $valid_elements ) $initArray['valid_elements'] = $valid_elements;
+if ( $invalid_elements ) $initArray['invalid_elements'] = $invalid_elements;
+
+// For people who really REALLY know what they're doing with TinyMCE
+// You can modify initArray to add, remove, change elements of the config before tinyMCE.init
+$initArray = apply_filters('tiny_mce_before_init', $initArray); // changed from action to filter
+
+// support for deprecated actions
+ob_start();
+do_action('mce_options');
+$mce_deprecated1 = ob_get_contents() || '';
+ob_end_clean();
+
+/*
+// Do we need to support this? Most likely will breal TinyMCE 3...
+ob_start();
+do_action('tinymce_before_init');
+$mce_deprecated2 = ob_get_contents() || '';
+ob_end_clean();
+*/
+
+// Settings for the gzip compression and cache
+$cache_path = dirname(__FILE__); // Cache path, this is where the .gz files will be stored
+$cache_ext = '.js';
+
+$disk_cache = ( ! isset($initArray['disk_cache']) || false == $initArray['disk_cache'] ) ? false : true;
+$compress = ( ! isset($initArray['compress']) || false == $initArray['compress'] ) ? false : true;
+$del_old_cache = ( ! isset($initArray['del_old_cache']) || false == $initArray['del_old_cache'] ) ? false : true;
+
+$initArray['disk_cache'] = $initArray['compress'] = $initArray['del_old_cache'] = null;
+unset( $initArray['disk_cache'], $initArray['compress'], $initArray['del_old_cache'] );
+
+$plugins = explode( ',', $initArray['plugins'] );
+$theme = ( 'simple' == $initArray['theme'] ) ? 'simple' : 'advanced';
+$language = isset($initArray['language']) ? substr( $initArray['language'], 0, 2 ) : 'en';
+$enc = $cacheKey = $suffix = $mce_options = ''; 
+
+// Custom extra javascripts to pack
+$custom_js = array(); //$custom_js = apply_filters('tinymce_custom_js', array());
+
+// Check if supports gzip
+if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+    $encodings = explode( ',', strtolower( preg_replace('/\s+/', '', $_SERVER['HTTP_ACCEPT_ENCODING']) ) );
+
+    if ( (in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------']) ) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') ) {
+        $enc = in_array('x-gzip', $encodings) ? 'x-gzip' : 'gzip';
+        $cache_ext = '.gz';
+    }
+}
+
+// Setup cache info
+if ( $disk_cache && $cache_path ) {
+
+    $ver = isset($_GET['ver']) ? (int) $_GET['ver'] : '';
+    $cacheKey = $initArray['plugins'] . $language . $theme . $suffix . $ver;
+
+    foreach ( $custom_js as $file )
+        $cacheKey .= $file;
+
+    $cacheKey = md5( $cacheKey );
+    $cache_file = $cache_path . '/tiny_mce_' . $cacheKey . $cache_ext;
+}
+
+cache_javascript_headers();
+
+// Use cached file if exists
+if ( $disk_cache && file_exists($cache_file) ) {
+    if ( '.gz' == $cache_ext )
+        header( 'Content-Encoding: ' . $enc );
+
+    echo getFileContents( $cache_file );
+    exit;
+}
+
+foreach ( $initArray as $k => $v ) 
+    $mce_options .= $k . ':"' . $v . '", ';
+
+$mce_options .= $mce_deprecated1;
+$mce_options = rtrim( trim($mce_options), '\n\r,' );
+
+$content = 'var tinyMCEPreInit = { suffix : "' . $suffix . '", base : "' . $baseurl . '" };';
+$content .= 'var tinyMCE_GZ = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false, suffix : "' . $suffix . '" }, baseURL : "' . $baseurl . '" };';
+
+// Load patch
+$content .= getFileContents( 'tiny_mce_ext.js' );
+
+// Add core
+$content .= getFileContents( 'tiny_mce' . $suffix . '.js' );
+
+// Patch loading functions
+$content .= 'tinyMCE_GZ.start();';
+
+// Add all languages (WP)
+include_once( dirname(__FILE__).'/langs/wp-langs.php' );
+$content .= $strings;
+
+// Add themes
+$content .= getFileContents( 'themes/' . $theme . '/editor_template' . $suffix . '.js' );
+
+// Add plugins
+foreach ( $plugins as $plugin ) 
+    $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin' . $suffix . '.js' );
+
+// Add custom files
+foreach ( $custom_js as $file )
+    $content .= getFileContents($file);
+
+// Add external plugins and init 
+$content .= $ext_plugins . 'tinyMCE.init({' . $mce_options . '});'; // $mce_deprecated2 . 
+
+// Generate GZIP'd content
+if ( '.gz' == $cache_ext ) {
+    header('Content-Encoding: ' . $enc);
+    $cache_data = gzencode( $content, 9, FORCE_GZIP );
+} else
+    $cache_data = $content;
+
+// Stream to client
+echo $cache_data;
+
+// Write file
+if ( '' != $cacheKey ) {
+    if ( $del_old_cache ) {
+        $old_key = getFileContents('tiny_mce_compressed_key');
+            
+        if ( '' != $old_key ) { //  && $old_key != $cacheKey
+            $old_cache = $cache_path . '/tiny_mce_' . $old_key . $cache_ext;
+            @unlink($old_cache);
         }
+            
+        putFileContents( 'tiny_mce_compressed_key', $cacheKey );
     }
-
-    // Set up init variables
-    $valid_elements = '*[*]';
-    $valid_elements = apply_filters('mce_valid_elements', $valid_elements);
-
-    $invalid_elements = apply_filters('mce_invalid_elements', '');
-
-    $plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen' );
-    $plugins = apply_filters('mce_plugins', $plugins);
-    $plugins = implode($plugins, ',');
-
-    $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'outdent', 'indent', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', '|', 'wp_help', 'wp_adv' ));
-    $mce_buttons = implode($mce_buttons, ',');
-
-
-    $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', '|', 'removeformat', 'cleanup', '|', 'media', 'charmap', 'blockquote', '|', 'undo', 'redo', 'fullscreen' ));
-    $mce_buttons_2 = implode($mce_buttons_2, ',');
-
-    $mce_buttons_3 = apply_filters('mce_buttons_3', array());
-    $mce_buttons_3 = implode($mce_buttons_3, ',');
-
-    $mce_buttons_4 = apply_filters('mce_buttons_4', array());
-    $mce_buttons_4 = implode($mce_buttons_4, ',');
-
-    $mce_browsers = apply_filters('mce_browsers', array('msie', 'gecko', 'opera', 'safari'));
-    $mce_browsers = implode($mce_browsers, ',');
-
-    $mce_css = get_option('siteurl') . '/wp-includes/js/tinymce/wordpress.css';
-    $mce_css = apply_filters('mce_css', $mce_css);
-    if ( $_SERVER['HTTPS'] == 'on' )
-        $mce_css = str_replace('http://', 'https://', $mce_css);
-
-    $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
+        
+    putFileContents( $cache_file, $cache_data );
+}
 ?>
-
-initArray = {
-    mode : "none",
-    onpageload : "wpEditorInit",
-    width : "100%",
-    theme : "advanced",
-    skin : "wp_theme",
-    theme_advanced_buttons1 : "<?php echo $mce_buttons; ?>",
-    theme_advanced_buttons2 : "<?php echo $mce_buttons_2; ?>",
-    theme_advanced_buttons3 : "<?php echo $mce_buttons_3; ?>",
-    theme_advanced_buttons4 : "<?php echo $mce_buttons_4; ?>",
-    language : "<?php echo $mce_locale; ?>",
-    theme_advanced_toolbar_location : "top",
-    theme_advanced_toolbar_align : "left",
-    theme_advanced_statusbar_location : "bottom",
-    theme_advanced_resizing : true,
-    browsers : "<?php echo $mce_browsers; ?>",
-    dialog_type : "modal",
-    theme_advanced_resize_horizontal : false,
-    convert_urls : false,
-    relative_urls : false,
-    remove_script_host : false,
-    fix_list_elements : true,
-    fix_table_elements : true,
-    gecko_spellcheck : true,
-    entities : "38,amp,60,lt,62,gt",
-    accessibility_focus : false,
-    tab_focus : ":next",
-    content_css : "<?php echo $mce_css; ?>",
-    <?php if ( $valid_elements ) echo 'valid_elements : "' . $valid_elements . '",' . "\n"; ?>
-    <?php if ( $invalid_elements ) echo 'invalid_elements : "' . $invalid_elements . '",' . "\n"; ?>
-    save_callback : "switchEditors.saveCallback",
-<?php do_action('mce_options'); ?>
-    plugins : "<?php echo $plugins; ?>"
-};
-
-<?php
-    // For people who really REALLY know what they're doing with TinyMCE
-    // You can modify initArray to add, remove, change elements of the config before tinyMCE.init
-    do_action('tinymce_before_init');
-?>
-
-tinyMCE_GZ.init(initArray);

trunk/wp-includes/js/tinymce/tiny_mce_gzip.php

@@ -1 @@
-<?php
-/** Based on:
- * $Id: tiny_mce_gzip.php 315 2007-10-25 14:03:43Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2005-2006, Moxiecode Systems AB, All rights reserved.
- *
- * This file compresses the TinyMCE JavaScript using GZip and
- * enables the browser to do two requests instead of one for each .js file.
- * Notice: This script defaults the button_tile_map option to true for extra performance.
- */
-
-@require_once('../../../wp-config.php');  // For get_bloginfo().
-cache_javascript_headers();
-
-if ( isset($_GET['load']) ) {
-
-    function getParam( $name, $def = false ) {
-        if ( ! isset($_GET[$name]) )
-            return $def;
-
-        return preg_replace( "/[^0-9a-z\-_,]+/i", "", $_GET[$name] ); // Remove anything but 0-9,a-z,-_
-    }
-
-    function getFileContents($path) {
-        $path = realpath($path);
-
-        if ( ! $path || !@is_file($path) )
-            return '';
-
-        if ( function_exists('file_get_contents') )
-            return @file_get_contents($path);
-
-        $content = '';
-        $fp = @fopen( $path, 'r' );
-        if (!$fp)
-            return '';
-
-        while ( ! feof($fp) )
-            $content .= fgets($fp);
-
-        fclose($fp);
-
-        return $content;
-    }
-
-    function putFileContents( $path, $content ) {
-        if ( function_exists('file_put_contents') )
-            return @file_put_contents( $path, $content );
-
-        $fp = @fopen($path, 'wb');
-        if ($fp) {
-            fwrite($fp, $content);
-            fclose($fp);
-        }
-    }
-
-    // WP defaults
-    $themes = explode( ',', getParam('themes', 'advanced') );
-
-    $language = getParam( 'languages', 'en' );
-    $language = strtolower( substr($language, 0, 2) ); // only ISO 639-1
-
-    $plugins = explode( ',', getParam('plugins', '') );
-    $cachePath = realpath('.'); // Cache path, this is where the .gz files will be stored
-
-    $encodings = array();
-    $supportsGzip = $diskCache = false;
-    $compress = $core = true;
-    $suffix = $content = $enc = $cacheKey = '';
-
-    // Custom extra javascripts to pack
-    // WP - add a hook for external plugins to be compressed too?
-    $custom = array(/*
-        'some custom .js file',
-        'some custom .js file'
-    */);
-
-    // Setup cache info
-    if ( $diskCache ) {
-        if ( ! $cachePath )
-            die('Real path failed.');
-
-        $cacheKey = getParam( 'plugins', '' ) . getParam( 'languages', '' ) . getParam( 'themes', '' ) . $suffix;
-
-        foreach ( $custom as $file )
-            $cacheKey .= $file;
-
-        $cacheKey = md5($cacheKey);
-
-        if ( $compress )
-            $cacheFile = $cachePath . '/tiny_mce_' . $cacheKey . '.gz';
-        else
-            $cacheFile = $cachePath . '/tiny_mce_' . $cacheKey . '.js';
-    }
-
-    // Check if it supports gzip
-    if ( isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) )
-        $encodings = explode(',', strtolower(preg_replace( '/\s+/', '', $_SERVER['HTTP_ACCEPT_ENCODING']) ) );
-
-    if ( ( in_array('gzip', $encodings ) || in_array( 'x-gzip', $encodings ) || isset($_SERVER['---------------']) ) && function_exists( 'ob_gzhandler' ) && ! ini_get('zlib.output_compression') ) {
-        $enc = in_array( 'x-gzip', $encodings ) ? 'x-gzip' : 'gzip';
-        $supportsGzip = true;
-    }
-
-    // Use cached file disk cache
-    if ( $diskCache && $supportsGzip && file_exists($cacheFile) ) {
-        if ( $compress )
-            header('Content-Encoding: ' . $enc);
-
-        echo getFileContents( $cacheFile );
-        die();
-    }
-
-    // Add core
-    if ( $core == 'true' ) {
-        $content .= getFileContents( 'tiny_mce' . $suffix . '.js' );
-
-        // Patch loading functions
-        $content .= 'tinyMCE_GZ.start();';
-    }
-
-    // Add all languages (WP)
-    include_once( dirname(__file__).'/langs/wp-langs.php' );
-    $content .= $strings;
-
-    // Add themes
-    foreach ( $themes as $theme ) 
-        $content .= getFileContents( 'themes/' . $theme . '/editor_template' . $suffix . '.js' );
-    
-    // Add plugins
-    foreach ( $plugins as $plugin ) 
-        $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin' . $suffix . '.js' );
-
-    // Add custom files
-    foreach ( $custom as $file )
-        $content .= getFileContents($file);
-
-    // Restore loading functions
-    if ( $core == 'true' )
-        $content .= 'tinyMCE_GZ.end();';
-
-    // Generate GZIP'd content
-    if ( $supportsGzip ) {
-        if ( $compress ) {
-            header('Content-Encoding: ' . $enc);
-            $cacheData = gzencode( $content, 9, FORCE_GZIP );
-        } else
-            $cacheData = $content;
-
-        // Write gz file
-        if ( $diskCache && '' != $cacheKey )
-            putFileContents( $cacheFile, $cacheData );
-
-        // Stream to client
-        echo $cacheData;
-    } else {
-        // Stream uncompressed content
-        echo $content;
-    }
-
-    exit;
-}
-?>
-
-var tinyMCEPreInit = {suffix : ''};
-
-var tinyMCE_GZ = {
-    settings : {
-        themes : '',
-        plugins : '',
-        languages : '',
-        disk_cache : false,
-        page_name : 'tiny_mce_gzip.php',
-        debug : false,
-        suffix : ''
-    },
-
-    opt : {},
-
-    init : function(o, cb) {
-        var t = this, n, s = t.settings, nl = document.getElementsByTagName('script');
-
-        t.opt = o;
-
-        s.themes = o.theme;
-        s.plugins = o.plugins; 
-        s.languages = o.language;
-        t.settings = s;
-
-        t.cb = cb || '';
-
-        for (i=0; i<nl.length; i++) {
-            n = nl[i];
-
-            if (n.src && n.src.indexOf('tiny_mce') != -1)
-                t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
-        }
-        tinyMCEPreInit.base = t.baseURL;
-        
-        if (!t.coreLoaded)
-            t.loadScripts(1, s.themes, s.plugins, s.languages);
-    },
-
-    loadScripts : function(co, th, pl, la, cb, sc) {
-        var t = this, x, w = window, q, c = 0, ti, s = t.settings;
-
-        function get(s) {
-            x = 0;
-
-            try {
-                x = new ActiveXObject(s);
-            } catch (s) {
-            }
-
-            return x;
-        };
-
-        // Build query string
-        q = 'load=true&js=true&diskcache=' + (s.disk_cache ? 'true' : 'false') + '&core=' + (co ? 'true' : 'false') + '&suffix=' + escape(s.suffix) + '&themes=' + escape(th) + '&plugins=' + escape(pl) + '&languages=' + escape(la);
-
-        if (co)
-            t.coreLoaded = 1;
-
-    //  document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + t.baseURL + '/' + s.page_name + '?' + q + '"></script>');
-
-        // Send request
-        x = w.XMLHttpRequest ? new XMLHttpRequest() : get('Msxml2.XMLHTTP') || get('Microsoft.XMLHTTP');
-        x.overrideMimeType && x.overrideMimeType('text/javascript');
-        x.open('GET', t.baseURL + '/' + s.page_name + '?' + q, !!cb);
-//      x.setRequestHeader('Content-Type', 'text/javascript');
-        x.send('');
-
-        // Handle asyncronous loading
-        if (cb) {
-            // Wait for response
-            ti = w.setInterval(function() {
-                if (x.readyState == 4 || c++ > 10000) {
-                    w.clearInterval(ti);
-
-                    if (c < 10000 && x.status == 200) {
-                        t.loaded = 1;
-                        t.eval(x.responseText);
-                        tinymce.dom.Event.domLoaded = true;
-                    //  cb.call(sc || t, x);
-                    }
-
-                    ti = x = null;
-                }
-            }, 10);
-        } else
-            t.eval(x.responseText);
-    },
-
-    start : function() {
-        var t = this, each = tinymce.each, s = t.settings, sl, ln = s.languages.split(',');
-
-        tinymce.suffix = s.suffix;
-
-        // Extend script loader
-        tinymce.create('tinymce.compressor.ScriptLoader:tinymce.dom.ScriptLoader', {
-            loadScripts : function(sc, cb, s) {
-                var ti = this, th = [], pl = [], la = [];
-
-                each(sc, function(o) {
-                    var u = o.url;
-
-                    if ((!ti.lookup[u] || ti.lookup[u].state != 2) && u.indexOf(t.baseURL) === 0) {
-                        // Collect theme
-                        if (u.indexOf('editor_template') != -1) {
-                            th.push(/\/themes\/([^\/]+)/.exec(u)[1]);
-                            load(u, 1);
-                        }
-
-                        // Collect plugin
-                        if (u.indexOf('editor_plugin') != -1) {
-                            pl.push(/\/plugins\/([^\/]+)/.exec(u)[1]);
-                            load(u, 1);
-                        }
-
-                        // Collect language
-                        if (u.indexOf('/langs/') != -1) {
-                            la.push(/\/langs\/([^.]+)/.exec(u)[1]);
-                            load(u, 1);
-                        }
-                    }
-                });
-
-                if (th.length + pl.length + la.length > 0) {
-                    if (sl.settings.strict_mode) {
-                        // Async
-                        t.loadScripts(0, th.join(','), pl.join(','), la.join(','), cb, s);
-                        return;
-                    } else
-                        t.loadScripts(0, th.join(','), pl.join(','), la.join(','), cb, s);
-                }
-
-                return ti.parent(sc, cb, s);
-            }
-        });
-
-        sl = tinymce.ScriptLoader = new tinymce.compressor.ScriptLoader();
-
-        function load(u, sp) {
-            var o;
-
-            if (!sp)
-                u = t.baseURL + u;
-
-            o = {url : u, state : 2};
-            sl.queue.push(o);
-            sl.lookup[o.url] = o;
-        };
-
-        // Add core languages
-        each (ln, function(c) {
-            if (c)
-                load('/langs/' + c + '.js');
-        });
-
-        // Add themes with languages
-        each(s.themes.split(','), function(n) {
-            if (n) {
-                load('/themes/' + n + '/editor_template' + s.suffix + '.js');
-
-                each (ln, function(c) {
-                    if (c)
-                        load('/themes/' + n + '/langs/' + c + '.js');
-                });
-            }
-        });
-
-        // Add plugins with languages
-        each(s.plugins.split(','), function(n) {
-            if (n) {
-                load('/plugins/' + n + '/editor_plugin' + s.suffix + '.js');
-
-                each (ln, function(c) {
-                    if (c)
-                        load('/plugins/' + n + '/langs/' + c + '.js');
-                });
-            }
-        });
-    },
-
-    end : function() {
-       tinyMCE.init(this.opt);
-    },
-
-    eval : function(co) {
-        var w = window;
-
-        // Evaluate script
-        if (!w.execScript) {
-            try {
-                eval.call(w, co);
-            } catch (ex) {
-                eval(co, w); // Firefox 3.0a8
-            }
-        } else
-            w.execScript(co); // IE
-    }
-};

trunk/wp-includes/script-loader.php

@@ -31 +31 @@
 
         // Modify this version when tinyMCE plugins are changed
-        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080208' );
-
         $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
-        $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20080208' );
+        $this->add( 'tiny_mce', $mce_config, false, '20080209' );
         
         $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
@@ -479 +477 @@
 // These localizations require information that may not be loaded even by init
 function wp_just_in_time_script_localization() {
-    wp_localize_script( 'wp_tiny_mce', 'wpTinyMCEConfig', array( 'defaultEditor' => wp_default_editor() ) );
+    wp_localize_script( 'tiny_mce', 'wpTinyMCEConfig', array( 'defaultEditor' => wp_default_editor() ) );
 }