Changeset 32091

Timestamp:

04/08/2015 10:27:57 PM (10 years ago)

Author:

ocean90

Message:

Customize Headers: Improve handling of the initial header model.

Headers are currently keyed by the basename of the image, see #31786. When two images have the same key only one image will be listed and the current image can be empty in the header control.
To prevent this we now fall back to the raw current header image if the image isn't in _wpCustomizeHeader.uploads.

props sirbrillig.
fixes #31742.

File:

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

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

@@ -1693 +1693 @@
             this.btnRemove.on( 'click', this.removeImage );
 
-            api.HeaderTool.currentHeader = new api.HeaderTool.ImageModel();
+            api.HeaderTool.currentHeader = this.getInitialHeaderImage();
 
             new api.HeaderTool.CurrentView({
@@ -1714 +1714 @@
                 api.HeaderTool.DefaultsList
             ]);
+        },
+
+        /**
+         * Returns a new instance of api.HeaderTool.ImageModel based on the currently
+         * saved header image (if any).
+         *
+         * @since 4.2.0
+         *
+         * @returns {Object} Options
+         */
+        getInitialHeaderImage: function() {
+            if ( ! api.get().header_image || ! api.get().header_image_data || _.contains( [ 'remove-header', 'random-default-image', 'random-uploaded-image' ], api.get().header_image ) ) {
+                return new api.HeaderTool.ImageModel();
+            }
+
+            // Get the matching uploaded image object.
+            var currentHeaderObject = _.find( _wpCustomizeHeader.uploads, function( imageObj ) {
+                return ( imageObj.attachment_id === api.get().header_image_data.attachment_id );
+            } );
+            // Fall back to raw current header image.
+            if ( ! currentHeaderObject ) {
+                currentHeaderObject = {
+                    url: api.get().header_image,
+                    thumbnail_url: api.get().header_image,
+                    attachment_id: api.get().header_image_data.attachment_id
+                };
+            }
+
+            return new api.HeaderTool.ImageModel({
+                header: currentHeaderObject,
+                choice: currentHeaderObject.url.split( '/' ).pop()
+            });
         },