Changeset 37167

Timestamp:

04/08/2016 01:22:06 AM (9 years ago)

Author:

azaozz

Message:

Customizer: fix cropping of small images when setting header image, site icon or logo.

Props obenland.
Fixes #36412.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (3 diffs)

trunk/src/wp-admin/js/customize-controls.js

@@ -2098 +2098 @@
                 yInit = parseInt( control.params.height, 10 ),
                 ratio = xInit / yInit,
-                xImg  = realWidth,
-                yImg  = realHeight,
+                xImg  = xInit,
+                yImg  = yInit,
                 x1, y1, imgSelectOptions;
 
             controller.set( 'canSkipCrop', ! control.mustBeCropped( flexWidth, flexHeight, xInit, yInit, realWidth, realHeight ) );
 
-            if ( xImg / yImg > ratio ) {
-                yInit = yImg;
+            if ( realWidth / realHeight > ratio ) {
+                yInit = realHeight;
                 xInit = yInit * ratio;
             } else {
-                xInit = xImg;
+                xInit = realWidth;
                 yInit = xInit / ratio;
             }
 
-            x1 = ( xImg - xInit ) / 2;
-            y1 = ( yImg - yInit ) / 2;
+            x1 = ( realWidth - xInit ) / 2;
+            y1 = ( realHeight - yInit ) / 2;
 
             imgSelectOptions = {
@@ -2122 +2122 @@
                 imageWidth: realWidth,
                 imageHeight: realHeight,
+                minWidth: xImg > xInit ? xInit : xImg,
+                minHeight: yImg > yInit ? yInit : yImg,
                 x1: x1,
                 y1: y1,
@@ -2131 +2133 @@
                 imgSelectOptions.aspectRatio = xInit + ':' + yInit;
             }
-            if ( flexHeight === false ) {
-                imgSelectOptions.maxHeight = yInit;
-            }
-            if ( flexWidth === false ) {
-                imgSelectOptions.maxWidth = xInit;
+
+            if ( true === flexHeight ) {
+                delete imgSelectOptions.minHeight;
+                imgSelectOptions.maxWidth = realWidth;
+            }
+
+            if ( true === flexWidth ) {
+                delete imgSelectOptions.minWidth;
+                imgSelectOptions.maxHeight = realHeight;
             }