Changeset 28081

Timestamp:

04/11/2014 10:16:01 PM (11 years ago)

Author:

azaozz

Message:

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

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-includes/class-wp-editor.php (modified) (2 diffs)
• src/wp-includes/js/tinymce/wp-tinymce.php (modified) (1 diff)

trunk/Gruntfile.js

@@ -57 +57 @@
                             '!wp-includes/js/underscore.js',
                             '!wp-includes/js/jquery/jquery.masonry.js',
+                            '!wp-includes/js/tinymce/tinymce.js',
                             '!wp-includes/version.php' // Exclude version.php
                         ],

trunk/src/wp-includes/class-wp-editor.php

@@ -1081 +1081 @@
 
         $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 ) {
@@ -1086 +1088 @@
                 echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
             } 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";
             }

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

@@ -33 +33 @@
     echo $file;
 } else {
-    echo get_file($basepath . '/tiny_mce.js');
-    echo get_file($basepath . '/wp-tinymce-schema.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 . '/tinymce.min.js' );
+    echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
 }
 exit;