Changeset 29284

Timestamp:

07/24/2014 07:59:18 PM (12 years ago)

Author:

wonderboymusic

Message:

When gallery settings are overridden, the JS-generated shortcodes need to check the new defaults before deleting attributes that it suspects are the same as the original default values.

wp.media.collection has a new method to do this: setDefaults(). Also flips the use of _.extend to allow this method to be overriden on instance creation.

See #28693.

File:

• trunk/src/wp-includes/js/media-editor.js (modified) (5 diffs)

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

@@ -356 +356 @@
                 var collections = {};
 
-                return _.extend( attributes, {
+                return _.extend( {
                         coerce : wp.media.coerce,
                         /**
@@ -479 +479 @@
                                 }
 
-                                // Remove default attributes from the shortcode.
-                                _.each( this.defaults, function( value, key ) {
-                                        attrs[ key ] = self.coerce( attrs, key );
-                                        if ( value === attrs[ key ] ) {
-                                                delete attrs[ key ];
-                                        }
-                                });
+                                attrs = this.setDefaults( attrs );
 
                                 shortcode = new wp.shortcode({
@@ -574 +568 @@
 
                                 return this.frame;
-                        }
-                });
+                        },
+
+                        setDefaults: function( attrs ) {
+                                var self = this;
+                                // Remove default attributes from the shortcode.
+                                _.each( this.defaults, function( value, key ) {
+                                        attrs[ key ] = self.coerce( attrs, key );
+                                        if ( value === attrs[ key ] ) {
+                                                delete attrs[ key ];
+                                        }
+                                });
+
+                                return attrs;
+                        }
+                }, attributes );
         };
 
-        wp.media.galleryDefaults = {
+        wp.media._galleryDefaults = {
                 itemtag: 'dl',
                 icontag: 'dt',
@@ -591 +598 @@
 
         if ( wp.media.view.settings.galleryDefaults ) {
-                _.extend( wp.media.galleryDefaults, wp.media.view.settings.galleryDefaults );
+                wp.media.galleryDefaults = _.extend( {}, wp.media._galleryDefaults, wp.media.view.settings.galleryDefaults );
+        } else {
+                wp.media.galleryDefaults = wp.media._galleryDefaults;
         }
 
@@ -598 +607 @@
                 type : 'image',
                 editTitle : wp.media.view.l10n.editGalleryTitle,
-                defaults : wp.media.galleryDefaults
+                defaults : wp.media.galleryDefaults,
+
+                setDefaults: function( attrs ) {
+                        var self = this, changed = ! _.isEqual( wp.media.galleryDefaults, wp.media._galleryDefaults );
+                        _.each( this.defaults, function( value, key ) {
+                                attrs[ key ] = self.coerce( attrs, key );
+                                if ( value === attrs[ key ] && ( ! changed || value === wp.media._galleryDefaults[ key ] ) ) {
+                                        delete attrs[ key ];
+                                }
+                        } );
+                        return attrs;
+                }
         });