Changeset 38948 for trunk/src/wp-includes/theme.php

Timestamp:

10/26/2016 06:51:11 AM (9 years ago)

Author:

westonruter

Message:

Customize: Improve custom background properties UI.

Introduces new control for managing the background position. Adds control for setting the background-size.

Props cdog, celloexpressions, grapplerulrich, MikeHansenMe, FolioVision, afercia, helen, melchoyce, karmatosed, westonruter, Kelderic, sebastian.pisula.
Fixes #22058.

File:

• trunk/src/wp-includes/theme.php (modified) (2 diffs)

trunk/src/wp-includes/theme.php

@@ -1375 +1375 @@
 
     if ( $background ) {
-        $image = " background-image: url('$background');";
-
+        $image = " background-image: url(" . wp_json_encode( $background ) . ");";
+
+        // Background Position.
+        $position_x = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
+        $position_y = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
+
+        if ( ! in_array( $position_x, array( 'left', 'center', 'right' ), true ) ) {
+            $position_x = 'left';
+        }
+
+        if ( ! in_array( $position_y, array( 'top', 'center', 'bottom' ), true ) ) {
+            $position_y = 'top';
+        }
+
+        $position = " background-position: $position_x $position_y;";
+
+        // Background Size.
+        $size = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
+
+        if ( ! in_array( $size, array( 'auto', 'contain', 'cover' ), true ) ) {
+            $size = 'auto';
+        }
+
+        $size = " background-size: $size;";
+
+        // Background Repeat.
         $repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-        if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
+
+        if ( ! in_array( $repeat, array( 'repeat-x', 'repeat-y', 'repeat', 'no-repeat' ), true ) ) {
             $repeat = 'repeat';
+        }
+
         $repeat = " background-repeat: $repeat;";
 
-        $position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-        if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
-            $position = 'left';
-        $position = " background-position: top $position;";
-
+        // Background Scroll.
         $attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
-        if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
+
+        if ( 'fixed' !== $attachment ) {
             $attachment = 'scroll';
+        }
+
         $attachment = " background-attachment: $attachment;";
 
-        $style .= $image . $repeat . $position . $attachment;
+        $style .= $image . $position . $size . $repeat . $attachment;
     }
 ?>
@@ -1773 +1799 @@
             $defaults = array(
                 'default-image'          => '',
+                'default-preset'         => 'default',
+                'default-position-x'     => 'left',
+                'default-position-y'     => 'top',
+                'default-size'           => 'auto',
                 'default-repeat'         => 'repeat',
-                'default-position-x'     => 'left',
                 'default-attachment'     => 'scroll',
                 'default-color'          => '',