Changeset 10369

Timestamp:

01/16/2009 12:58:38 PM (18 years ago)

Author:

azaozz

Message:

Concatenated and compressed versions of the default TinyMCE scripts

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (4 diffs)
• wp-includes/js/tinymce/utils/mclayer.js (deleted)
• wp-includes/js/tinymce/wp-tinymce.js (added)
• wp-includes/js/tinymce/wp-tinymce.js.gz (added)
• wp-includes/js/tinymce/wp-tinymce.php (added)

trunk/wp-admin/admin-header.php

@@ -39 +39 @@
 
 if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) {
-        add_action( 'admin_footer', 'wp_tiny_mce' );
+        add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
         wp_enqueue_script('quicktags');
 }

trunk/wp-admin/includes/post.php

@@ -1114 +1114 @@
  */
 function wp_tiny_mce( $teeny = false ) {
+        global $concatenate_scripts, $compress_scripts;
+        
         if ( ! user_can_richedit() )
                 return;
@@ -1144 +1146 @@
                 $mce_external_plugins = apply_filters('mce_external_plugins', array());
 
-                $ext_plugins = "\n";
+                $ext_plugins = '';
                 if ( ! empty($mce_external_plugins) ) {
 
@@ -1286 +1288 @@
         }
 
+        if ( ! isset($concatenate_scripts) )
+                script_concat_settings();
+
         $language = $initArray['language'];
-
-        $ver = apply_filters('tiny_mce_version', '3101');
+        $zip = $compress_scripts ? 1 : 0;
+        $ver = apply_filters('tiny_mce_version', '3211');
 
         if ( 'en' != $language )
@@ -1306 +1311 @@
         query : "ver=<?php echo $ver; ?>",
         mceInit : {<?php echo $mce_options; ?>},
-
-        go : function() {
-                var t = this, sl = tinymce.ScriptLoader, ln = t.mceInit.language, th = t.mceInit.theme, pl = t.mceInit.plugins;
-
-                sl.markDone(t.base + '/langs/' + ln + '.js');
-
-                sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '.js');
-                sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '_dlg.js');
-
-                tinymce.each(pl.split(','), function(n) {
-                        if (n && n.charAt(0) != '-') {
-                                sl.markDone(t.base + '/plugins/' + n + '/langs/' + ln + '.js');
-                                sl.markDone(t.base + '/plugins/' + n + '/langs/' + ln + '_dlg.js');
-                        }
-                });
-        },
-
-        load_ext : function(url,lang) {
-                var sl = tinymce.ScriptLoader;
-
-                sl.markDone(url + '/langs/' + lang + '.js');
-                sl.markDone(url + '/langs/' + lang + '_dlg.js');
-        }
+        load_ext : function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
 };
 /* ]]> */
 </script>
-<script type="text/javascript" src="<?php echo $baseurl; ?>/tiny_mce.js?ver=<?php echo $ver; ?>"></script>
-<?php if ( 'en' != $language && isset($lang) ) { ?>
-<script type="text/javascript">
-<?php echo $lang; ?>
-</script>
-<?php } else { ?>
-<script type="text/javascript" src="<?php echo $baseurl; ?>/langs/wp-langs-en.js?ver=<?php echo $ver; ?>"></script>
-<?php } ?>
+
+<?php
+        if ( $concatenate_scripts ) {
+                echo "<script type='text/javascript' src='$baseurl/wp-tinymce.php?c=$zip&amp;ver=$ver'></script>";
+        } else {
+                echo "<script type='text/javascript' src='$baseurl/tiny_mce.js?ver=$ver'></script>";
+
+                if ( 'en' != $language && isset($lang) )
+                        echo "<script type='text/javascript'>\n$lang\n</script>";
+                else
+                        echo "<script type='text/javascript' src='$baseurl/langs/wp-langs-en.js?ver=$ver'></script>";
+        }
+?>
+
 <script type="text/javascript">
 <?php if ( $ext_plugins ) echo $ext_plugins; ?>
-
-// Mark translations as done
+<?php if ( $concatenate_scripts ) { ?>
 tinyMCEPreInit.go();
-
-// Init
+<?php } else { ?>
+(function(){var t=tinyMCEPreInit,sl=tinymce.ScriptLoader,ln=t.mceInit.language,th=t.mceInit.theme,pl=t.mceInit.plugins;sl.markDone(t.base+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'_dlg.js');tinymce.each(pl.split(','),function(n){if(n&&n.charAt(0)!='-'){sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'.js');sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'_dlg.js');}});})();
+<?php } ?>
 tinyMCE.init(tinyMCEPreInit.mceInit);
 </script>
-
 <?php
 }
-?>