<!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>[42404] trunk/src/wp-admin: Media: improve flows for cropping on attachment details screen.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42404">42404</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42404","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-12-15 22:02:02 +0000 (Fri, 15 Dec 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: improve flows for cropping on attachment details screen.
On the "Attachment Details" screen:
* The crop button is always 'enabled'.
* Clicking the crop button with no selection selects the entire image.
* Clicking the crop button with the entire image selected doesn't do anything.
* Clicking the crop button with a selection crops as expected.
Props sonjanyc, afercia, mikeschroder.
Fixes <a href="https://core.trac.wordpress.org/ticket/30155">#30155</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminjsimageeditjs">trunk/src/wp-admin/js/image-edit.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2017-12-15 13:41:56 UTC (rev 42403)
+++ trunk/src/wp-admin/includes/image-edit.php 2017-12-15 22:02:02 UTC (rev 42404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-panel-content wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $note; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-menu wp-clearfix">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" onclick="imageEdit.handleCropToolClick( <?php echo "$post_id, '$nonce'"; ?>, this )" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // On some setups GD library does not provide imagerotate() - Ticket #11536
</span></span></pre></div>
<a id="trunksrcwpadminjsimageeditjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/image-edit.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/image-edit.js 2017-12-15 13:41:56 UTC (rev 42403)
+++ trunk/src/wp-admin/js/image-edit.js 2017-12-15 22:02:02 UTC (rev 42404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _view : false,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Handle crop tool clicks.
+ */
+ handleCropToolClick: function( postid, nonce, cropButton ) {
+ var img = $( '#image-preview-' + postid ),
+ selection = this.iasapi.getSelection();
+
+ // Ensure selection is available, otherwise reset to full image.
+ if ( isNaN( selection.x1 ) ) {
+ this.setCropSelection( postid, { 'x1': 0, 'y1': 0, 'x2': img.innerWidth(), 'y2': img.innerHeight(), 'width': img.innerWidth(), 'height': img.innerHeight() } );
+ selection = this.iasapi.getSelection();
+ }
+
+ // If we don't already have a selection, select the entire image.
+ if ( 0 === selection.x1 && 0 === selection.y1 && 0 === selection.x2 && 0 === selection.y2 ) {
+ this.iasapi.setSelection( 0, 0, img.innerWidth(), img.innerHeight(), true );
+ this.iasapi.setOptions( { show: true } );
+ this.iasapi.update();
+ } else {
+
+ // Otherwise, perform the crop.
+ imageEdit.crop( postid, nonce , cropButton );
+ }
+ },
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @summary Converts a value to an integer.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @memberof imageEdit
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +376,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> t.hold.sizer = max1 > max2 ? max2 / max1 : 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> t.initCrop(postid, img, parent);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- t.setCropSelection(postid, 0);
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (typeof callback !== 'undefined') && callback !== null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> callback();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,7 +603,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.initCrop(postid, img, parent);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.setCropSelection(postid, 0);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setCropSelection( postid, { 'x1': 0, 'y1': 0, 'x2': 0, 'y2': 0, 'width': img.innerWidth(), 'height': img.innerHeight() } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.toggleEditor(postid, 0);
</span><span class="cx" style="display: block; padding: 0 10px"> // Editor is ready, move focus to the first focusable element.
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.imgedit-wrap .imgedit-help-toggle' ).eq( 0 ).focus();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,8 +728,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> c = c || 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !c || ( c.width < 3 && c.height < 3 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.setDisabled($('.imgedit-crop', '#imgedit-panel-' + postid), 0);
- this.setDisabled($('#imgedit-crop-sel-' + postid), 0);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setDisabled( $( '.imgedit-crop', '#imgedit-panel-' + postid ), 1 );
+ this.setDisabled( $( '#imgedit-crop-sel-' + postid ), 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#imgedit-sel-width-' + postid).val('');
</span><span class="cx" style="display: block; padding: 0 10px"> $('#imgedit-sel-height-' + postid).val('');
</span><span class="cx" style="display: block; padding: 0 10px"> $('#imgedit-selection-' + postid).val('');
</span></span></pre>
</div>
</div>
</body>
</html>