<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28081] trunk: Don't include the non-minified tinymce.js in /build.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28081">28081</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-04-11 22:16:01 +0000 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/27739">#27739</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcewptinymcephp">trunk/src/wp-includes/js/tinymce/wp-tinymce.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4>Modified: trunk/Gruntfile.js (28080 => 28081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Gruntfile.js 2014-04-11 21:49:18 UTC (rev 28080)
+++ trunk/Gruntfile.js 2014-04-11 22:16:01 UTC (rev 28081)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> '!wp-includes/js/backbone.js',
</span><span class="cx"> '!wp-includes/js/underscore.js',
</span><span class="cx"> '!wp-includes/js/jquery/jquery.masonry.js',
</span><ins>+ '!wp-includes/js/tinymce/tinymce.js',
</ins><span class="cx"> '!wp-includes/version.php' // Exclude version.php
</span><span class="cx"> ],
</span><span class="cx"> dest: BUILD_DIR
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (28080 => 28081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-04-11 21:49:18 UTC (rev 28080)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-04-11 22:16:01 UTC (rev 28081)
</span><span class="lines">@@ -1080,12 +1080,14 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> $baseurl = self::$baseurl;
</span><ins>+ // 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';
</ins><span class="cx">
</span><span class="cx"> if ( $tmce_on ) {
</span><span class="cx"> if ( $compressed ) {
</span><span class="cx"> echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&$version'></script>\n";
</span><span class="cx"> } else {
</span><del>- echo "<script type='text/javascript' src='{$baseurl}/tinymce.js?$version'></script>\n";
</del><ins>+ echo "<script type='text/javascript' src='{$baseurl}/tinymce{$mce_suffix}.js?$version'></script>\n";
</ins><span class="cx"> echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcewptinymcephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/wp-tinymce.php (28080 => 28081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/wp-tinymce.php 2014-04-11 21:49:18 UTC (rev 28080)
+++ trunk/src/wp-includes/js/tinymce/wp-tinymce.php 2014-04-11 22:16:01 UTC (rev 28081)
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx"> header('Content-Encoding: gzip');
</span><span class="cx"> echo $file;
</span><span class="cx"> } else {
</span><del>- echo get_file($basepath . '/tiny_mce.js');
- echo get_file($basepath . '/wp-tinymce-schema.js');
</del><ins>+ // 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' );
</ins><span class="cx"> }
</span><span class="cx"> exit;
</span></span></pre>
</div>
</div>
</body>
</html>