<!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>[33053] trunk/src/wp-admin: Site Icon: Improve responsiveness for small screen devices.</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/33053">33053</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/33053","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-02 21:15:52 +0000 (Thu, 02 Jul 2015)</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'>Site Icon: Improve responsiveness for small screen devices.
Using Jcrop's `trueSize` argument also allows us to get rid of all that behind
the scenes temp image creating and back and forth calculating of image sizes.
Props tyxla for initial patch.
See <a href="https://core.trac.wordpress.org/ticket/16434">#16434</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsssiteiconcss">trunk/src/wp-admin/css/site-icon.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsiteiconphp">trunk/src/wp-admin/includes/class-wp-site-icon.php</a></li>
<li><a href="#trunksrcwpadminjssiteiconcropjs">trunk/src/wp-admin/js/site-icon-crop.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsssiteiconcss"></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/css/site-icon.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/site-icon.css 2015-07-02 21:04:57 UTC (rev 33052)
+++ trunk/src/wp-admin/css/site-icon.css 2015-07-02 21:15:52 UTC (rev 33053)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 720px;
</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">+.site-icon-crop-wrapper {
+ float: left;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-icon-crop-preview-shell {
</span><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,4 +59,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: 64px;
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 64px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+
+.site-icon-crop-shell .submit {
+ clear: both;
+}
+
+@media only screen and (max-width: 768px) {
+ .site-icon-crop-wrapper,
+ .site-icon-crop-preview-shell {
+ float: none;
+ }
+
+ .site-icon-crop-wrapper {
+ max-width: 100%;
+ margin-bottom: 20px;
+ }
+
+ .site-icon-crop-wrapper img {
+ max-width: 100%;
+ height: auto;
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsiteiconphp"></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/class-wp-site-icon.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-icon.php 2015-07-02 21:04:57 UTC (rev 33052)
+++ trunk/src/wp-admin/includes/class-wp-site-icon.php 2015-07-02 21:15:52 UTC (rev 33053)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,33 +249,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Let's resize the image so that the user can easier crop a image that in the admin view.
- $crop_height = absint( $this->page_crop * $image_size[1] / $image_size[0] );
- $cropped = wp_crop_image( $attachment_id, 0, 0, 0, 0, $this->page_crop, $crop_height );
- if ( ! $cropped || is_wp_error( $cropped ) ) {
- wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
- }
- $cropped_size = getimagesize( $cropped );
-
- // set default values (in case of no JS)
- $crop_ratio = $image_size[0] / $cropped_size[0];
- if ( $cropped_size[0] < $cropped_size[1] ) {
- $crop_x = 0;
- $crop_y = absint( ( $cropped_size[1] - $cropped_size[0] ) / 2 );
- $crop_size = $cropped_size[0];
- } elseif ( $cropped_size[0] > $cropped_size[1] ) {
- $crop_x = absint( ( $cropped_size[0] - $cropped_size[1] ) / 2 );
- $crop_y = 0;
- $crop_size = $cropped_size[1];
- } else {
- $crop_x = 0;
- $crop_y = 0;
- $crop_size = $cropped_size[0];
- }
-
- wp_delete_file( $cropped );
-
- wp_localize_script( 'site-icon-crop', 'wpSiteIconCropData', $this->initial_crop_data( $crop_ratio, $cropped_size ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_localize_script( 'site-icon-crop', 'wpSiteIconCropData', array(
+ 'init_x' => 0,
+ 'init_y' => 0,
+ 'init_size' => $this->min_size,
+ 'min_size' => $this->min_size,
+ 'width' => $image_size[0],
+ 'height' => $image_size[1],
+ ) );
</ins><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"> <div class="wrap">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,6 +268,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="hide-if-no-js description"><?php _e('Choose the part of the image you want to use as your site icon.'); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="hide-if-js description"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="site-icon-crop-wrapper">
+ <img src="<?php echo esc_url( $url ); ?>" id="crop-image" class="site-icon-crop-image" width="512" height="" alt="<?php esc_attr_e( 'Image to be cropped' ); ?>"/>
+ </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="site-icon-crop-preview-shell hide-if-no-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Preview' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php _e( 'As your favicon' ); ?></strong>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,16 +289,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $url ); ?>" id="preview-homeicon" alt="<?php esc_attr_e( 'Preview Home Icon' ); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="<?php echo esc_url( $url ); ?>" id="crop-image" class="site-icon-crop-image" width="<?php echo esc_attr( $cropped_size[0] ); ?>" height="<?php echo esc_attr( $cropped_size[1] ); ?>" alt="<?php esc_attr_e( 'Image to be cropped' ); ?>"/>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" id="crop-x" name="crop-x" value="<?php echo esc_attr( $crop_x ); ?>" />
- <input type="hidden" id="crop-y" name="crop-y" value="<?php echo esc_attr( $crop_y ); ?>" />
- <input type="hidden" id="crop-width" name="crop-w" value="<?php echo esc_attr( $crop_size ); ?>" />
- <input type="hidden" id="crop-height" name="crop-h" value="<?php echo esc_attr( $crop_size ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" id="crop-x" name="crop-x" value="0" />
+ <input type="hidden" id="crop-y" name="crop-y" value="0" />
+ <input type="hidden" id="crop-width" name="crop-w" value="<?php echo esc_attr( $this->min_size ); ?>" />
+ <input type="hidden" id="crop-height" name="crop-h" value="<?php echo esc_attr( $this->min_size ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="set_site_icon" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="crop_ratio" value="<?php echo esc_attr( $crop_ratio ); ?>" />
</del><span class="cx" style="display: block; padding: 0 10px"> <?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="create-new-attachment" value="true" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,8 +341,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->delete_site_icon();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_REQUEST['skip-cropping'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $crop_data = $this->convert_coordinates_from_resized_to_full( $_REQUEST['crop-x'], $_REQUEST['crop-y'], $_REQUEST['crop-w'], $_REQUEST['crop-h'], (float) $_REQUEST['crop_ratio'] );
- $cropped = wp_crop_image( $attachment_id, $crop_data['crop_x'], $crop_data['crop_y'], $crop_data['crop_width'], $crop_data['crop_height'], $this->min_size, $this->min_size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cropped = wp_crop_image( $attachment_id, $_REQUEST['crop-x'], $_REQUEST['crop-y'], $_REQUEST['crop-w'], $_REQUEST['crop-h'], $this->min_size, $this->min_size );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $create_new_attachement ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cropped = _copy_image_file( $attachment_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,70 +373,6 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This function is used to pass data to the localize script
- * so that we can center the cropper and also set the minimum
- * cropper.
- *
- * @since 4.3.0
- *
- * @param float $ratio
- * @param array $cropped_size
- * @return array
- */
- public function initial_crop_data( $ratio, $cropped_size ) {
- $init_x = $init_y = $init_size = 0;
-
- $min_crop_size = ( $this->min_size / $ratio );
- $resized_width = $cropped_size[0];
- $resized_height = $cropped_size[1];
-
- // Landscape format ( width > height )
- if ( $resized_width > $resized_height ) {
- $init_x = ( $this->page_crop - $resized_height ) / 2;
- $init_size = $resized_height;
- }
-
- // Portrait format ( height > width )
- if ( $resized_width < $resized_height ) {
- $init_y = ( $this->page_crop - $resized_width ) / 2;
- $init_size = $resized_height;
- }
-
- // Square height == width
- if ( $resized_width == $resized_height ) {
- $init_size = $resized_height;
- }
-
- return array(
- 'init_x' => $init_x,
- 'init_y' => $init_y,
- 'init_size' => $init_size,
- 'min_size' => $min_crop_size,
- );
- }
-
- /**
- * Converts the coordinates from the downsized image to the original image for accurate cropping.
- *
- * @since 4.3.0
- *
- * @param int $crop_x
- * @param int $crop_y
- * @param int $crop_width
- * @param int $crop_height
- * @param float $ratio
- * @return array
- */
- public function convert_coordinates_from_resized_to_full( $crop_x, $crop_y, $crop_width, $crop_height, $ratio ) {
- return array(
- 'crop_x' => floor( $crop_x * $ratio ),
- 'crop_y' => floor( $crop_y * $ratio ),
- 'crop_width' => floor( $crop_width * $ratio ),
- 'crop_height' => floor( $crop_height * $ratio ),
- );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Upload the file to be cropped in the second step.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span></span></pre></div>
<a id="trunksrcwpadminjssiteiconcropjs"></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/site-icon-crop.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/site-icon-crop.js 2015-07-02 21:04:57 UTC (rev 33052)
+++ trunk/src/wp-admin/js/site-icon-crop.js 2015-07-02 21:15:52 UTC (rev 33053)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,21 +16,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var rx = 64 / coords.w,
</span><span class="cx" style="display: block; padding: 0 10px"> ry = 64 / coords.h,
</span><span class="cx" style="display: block; padding: 0 10px"> preview_rx = 16 / coords.w,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preview_ry = 16 / coords.h,
- $cropImage = $( '#crop-image' ),
- $homeIcon = $( '#preview-homeicon' ),
- $favicon = $( '#preview-favicon' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preview_ry = 16 / coords.h;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $homeIcon.css({
- width: Math.round(rx * $cropImage.attr( 'width' ) ) + 'px',
- height: Math.round(ry * $cropImage.attr( 'height' ) ) + 'px',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#preview-homeicon' ).css({
+ width: Math.round(rx * wpSiteIconCropData.width ) + 'px',
+ height: Math.round(ry * wpSiteIconCropData.height ) + 'px',
</ins><span class="cx" style="display: block; padding: 0 10px"> marginLeft: '-' + Math.round(rx * coords.x) + 'px',
</span><span class="cx" style="display: block; padding: 0 10px"> marginTop: '-' + Math.round(ry * coords.y) + 'px'
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $favicon.css({
- width: Math.round( preview_rx * $cropImage.attr( 'width' ) ) + 'px',
- height: Math.round( preview_ry * $cropImage.attr( 'height' ) ) + 'px',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#preview-favicon' ).css({
+ width: Math.round( preview_rx * wpSiteIconCropData.width ) + 'px',
+ height: Math.round( preview_ry * wpSiteIconCropData.height ) + 'px',
</ins><span class="cx" style="display: block; padding: 0 10px"> marginLeft: '-' + Math.round( preview_rx * coords.x ) + 'px',
</span><span class="cx" style="display: block; padding: 0 10px"> marginTop: '-' + Math.floor( preview_ry* coords.y ) + 'px'
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> aspectRatio: 1,
</span><span class="cx" style="display: block; padding: 0 10px"> onSelect: siteIconCrop.updateCoords,
</span><span class="cx" style="display: block; padding: 0 10px"> onChange: siteIconCrop.updateCoords,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trueSize: [ wpSiteIconCropData.width, wpSiteIconCropData.height ],
</ins><span class="cx" style="display: block; padding: 0 10px"> minSize: [ wpSiteIconCropData.min_size, wpSiteIconCropData.min_size ]
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> jcrop_api.animateTo([wpSiteIconCropData.init_x, wpSiteIconCropData.init_y, wpSiteIconCropData.init_size, wpSiteIconCropData.init_size]);
</span></span></pre>
</div>
</div>
</body>
</html>