Changeset 41343

Timestamp:

09/08/2017 06:03:09 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Twenty Sixteen: Replace inline control structureв to improve code readability.

Fixes #38468.

File:

• trunk/src/wp-content/themes/twentysixteen/functions.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentysixteen/functions.php

@@ -372 +372 @@
         $width = $size[0];
 
-        840 <= $width && $sizes = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px';
+        if ( 840 <= $width ){
+                $sizes = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px';
+        }
 
         if ( 'page' === get_post_type() ) {
-                840 > $width && $sizes = '(max-width: ' . $width . 'px) 85vw, ' . $width . 'px';
+                if ( 840 > $width ) {
+                        $sizes = '(max-width: ' . $width . 'px) 85vw, ' . $width . 'px';
+                }
         } else {
-                840 > $width && 600 <= $width && $sizes = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 984px) 61vw, (max-width: 1362px) 45vw, 600px';
-                600 > $width && $sizes = '(max-width: ' . $width . 'px) 85vw, ' . $width . 'px';
+                if ( 840 > $width && 600 <= $width ) {
+                        $sizes = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 984px) 61vw, (max-width: 1362px) 45vw, 600px';
+                } elseif ( 600 > $width ) {
+                        $sizes = '(max-width: ' . $width . 'px) 85vw, ' . $width . 'px';
+                }
         }
 
@@ -398 +405 @@
 function twentysixteen_post_thumbnail_sizes_attr( $attr, $attachment, $size ) {
         if ( 'post-thumbnail' === $size ) {
-                is_active_sidebar( 'sidebar-1' ) && $attr['sizes'] = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 984px) 60vw, (max-width: 1362px) 62vw, 840px';
-                ! is_active_sidebar( 'sidebar-1' ) && $attr['sizes'] = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 88vw, 1200px';
+                if ( is_active_sidebar( 'sidebar-1' ) ) {
+                        $attr['sizes'] = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 984px) 60vw, (max-width: 1362px) 62vw, 840px';
+                } else {
+                        $attr['sizes'] = '(max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 88vw, 1200px';
+                }
         }
         return $attr;