sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't include the non-minified tinymce.js in /build. Load it when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG). Props nacin, fixes #27739

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@28081 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-04-11 22:16:01 +00:00
parent 33e687ca57
commit 8aacd10a8c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@ -56,6 +56,7 @@ module.exports = function(grunt) {
'!wp-includes/js/backbone.js', '!wp-includes/js/backbone.js',
'!wp-includes/js/underscore.js', '!wp-includes/js/underscore.js',
'!wp-includes/js/jquery/jquery.masonry.js', '!wp-includes/js/jquery/jquery.masonry.js',
'!wp-includes/js/tinymce/tinymce.js',
'!wp-includes/version.php' // Exclude version.php '!wp-includes/version.php' // Exclude version.php
], ],
dest: BUILD_DIR dest: BUILD_DIR

4
src/wp-includes/class-wp-editor.php
View File

@ -1080,12 +1080,14 @@ final class _WP_Editors {
<?php <?php
$baseurl = self::$baseurl; $baseurl = self::$baseurl;
// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
$mce_suffix = false !== strpos( $GLOBALS['wp_version'], '-src' ) ? '' : '.min';
if ( $tmce_on ) { if ( $tmce_on ) {
if ( $compressed ) { if ( $compressed ) {
echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n"; echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
} else { } else {
echo "<script type='text/javascript' src='{$baseurl}/tinymce.js?$version'></script>\n"; echo "<script type='text/javascript' src='{$baseurl}/tinymce{$mce_suffix}.js?$version'></script>\n";
echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n"; echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n";
} }

5
src/wp-includes/js/tinymce/wp-tinymce.php
View File

@ -32,7 +32,8 @@ if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODIN
header('Content-Encoding: gzip'); header('Content-Encoding: gzip');
echo $file; echo $file;
} else { } else {
echo get_file($basepath . '/tiny_mce.js'); // Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
echo get_file($basepath . '/wp-tinymce-schema.js'); echo get_file( $basepath . '/tinymce.min.js' );
echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
} }
exit; exit;