Changeset 36866

Timestamp:

03/06/2016 01:44:53 AM (4 years ago)

Author:

westonruter

Message:

Customize: Fix image cropping when doing live preview of theme switches.

Ensure that the Customizer gets bootstrapped with the pre-activated theme supplied in the custom-header-crop admin ajax requests.

Props faishal, rittesh.patel.
Fixes #32783.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (2 diffs)

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

@@ -2347 +2347 @@
                 api.HeaderTool.DefaultsList
             ]);
+
+            // Ensure custom-header-crop Ajax requests bootstrap the Customizer to activate the previewed theme.
+            wp.media.controller.Cropper.prototype.defaults.doCropArgs.wp_customize = 'on';
+            wp.media.controller.Cropper.prototype.defaults.doCropArgs.theme = api.settings.theme.stylesheet;
         },
 

trunk/src/wp-includes/js/media-views.js

@@ -283 +283 @@
         content:     'crop',
         router:      false,
-
-        canSkipCrop: false
+        canSkipCrop: false,
+
+        // Default doCrop Ajax arguments to allow the Customizer (for example) to inject state.
+        doCropArgs: {}
     },
 
@@ -368 +370 @@
 
     doCrop: function( attachment ) {
-        return wp.ajax.post( 'custom-header-crop', {
-            nonce: attachment.get('nonces').edit,
-            id: attachment.get('id'),
-            cropDetails: attachment.get('cropDetails')
-        } );
+        return wp.ajax.post( 'custom-header-crop', _.extend(
+            {},
+            this.defaults.doCropArgs,
+            {
+                nonce: attachment.get( 'nonces' ).edit,
+                id: attachment.get( 'id' ),
+                cropDetails: attachment.get( 'cropDetails' )
+            }
+        ) );
     }
 });