<!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>[27625] trunk/src/wp-includes: Only enqueue the image editor in the media modal in the admin.</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/27625">27625</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-19 21:15:50 +0000 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only enqueue the image editor in the media modal in the admin.
props gcorne.
see <a href="http://core.trac.wordpress.org/ticket/21811">#21811</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27624 => 27625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-19 20:48:28 UTC (rev 27624)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-19 21:15:50 UTC (rev 27625)
</span><span class="lines">@@ -5594,10 +5594,14 @@
</span><span class="cx"> */
</span><span class="cx"> editAttachment: function( event ) {
</span><span class="cx"> var editState = this.controller.state( 'edit-image' );
</span><del>- event.preventDefault();
</del><ins>+ if ( window.imageEdit ) {
+ event.preventDefault();
</ins><span class="cx">
</span><del>- editState.set( 'image', this.model );
- this.controller.setState( 'edit-image' );
</del><ins>+ editState.set( 'image', this.model );
+ this.controller.setState( 'edit-image' );
+ } else {
+ this.$el.addClass('needs-refresh');
+ }
</ins><span class="cx"> },
</span><span class="cx"> /**
</span><span class="cx"> * @param {Object} event
</span><span class="lines">@@ -5944,10 +5948,12 @@
</span><span class="cx">
</span><span class="cx"> editAttachment: function( event ) {
</span><span class="cx"> var editState = this.controller.state( 'edit-image' );
</span><del>- event.preventDefault();
</del><span class="cx">
</span><del>- editState.set( 'image', this.model.attachment );
- this.controller.setState( 'edit-image' );
</del><ins>+ if ( window.imageEdit ) {
+ event.preventDefault();
+ editState.set( 'image', this.model.attachment );
+ this.controller.setState( 'edit-image' );
+ }
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27624 => 27625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-19 20:48:28 UTC (rev 27624)
+++ trunk/src/wp-includes/media-template.php 2014-03-19 21:15:50 UTC (rev 27625)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx"> <div class="thumbnail">
</span><span class="cx"> <img src="{{ data.model.url }}" draggable="false" />
</span><span class="cx"> </div>
</span><del>- <# if ( data.attachment ) { #>
</del><ins>+ <# if ( data.attachment && window.imageEdit ) { #>
</ins><span class="cx"> <input type="button" class="edit-attachment button" value="<?php esc_attr_e( 'Edit Image' ); ?>" />
</span><span class="cx"> <# } #>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27624 => 27625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-03-19 20:48:28 UTC (rev 27624)
+++ trunk/src/wp-includes/media.php 2014-03-19 21:15:50 UTC (rev 27625)
</span><span class="lines">@@ -2536,6 +2536,9 @@
</span><span class="cx"> wp_enqueue_script( 'media-editor' );
</span><span class="cx"> wp_enqueue_script( 'media-audiovideo' );
</span><span class="cx"> wp_enqueue_style( 'media-views' );
</span><ins>+ if ( is_admin() ) {
+ wp_enqueue_script( 'image-edit' );
+ }
</ins><span class="cx"> wp_enqueue_style( 'imgareaselect' );
</span><span class="cx"> wp_plupload_default_settings();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (27624 => 27625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/script-loader.php 2014-03-19 20:48:28 UTC (rev 27624)
+++ trunk/src/wp-includes/script-loader.php 2014-03-19 21:15:50 UTC (rev 27625)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx">
</span><span class="cx"> // To enqueue media-views or media-editor, call wp_enqueue_media().
</span><span class="cx"> // Both rely on numerous settings, styles, and templates to operate correctly.
</span><del>- $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'image-edit' ), false, 1 );
</del><ins>+ $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 );
</ins><span class="cx"> $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
</span><span class="cx"> $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor', 'mce-view' ), false, 1 );
</span><span class="cx"> $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>