Changeset 27322

Timestamp:

02/27/2014 11:03:02 PM (11 years ago)

Author:

wonderboymusic

Message:

Rather than extending media.controller.CollectionAdd 3 times, make it a constructor that dynamically extends media.controller.Library and use instances of it instead.

See #26631.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (9 diffs)

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

@@ -868 +868 @@
      * wp.media.controller.CollectionAdd
      *
-     * @static
-     * @param {string} prop The shortcode slug
-     * @param {object} args
-     * @returns {wp.media.controller.Library}
-     */
-    media.controller.CollectionAdd = function ( prop, args ) {
-        /**
-         * @constructor
-         * @augments wp.media.controller.Library
-         * @augments wp.media.controller.State
-         * @augments Backbone.Model
-         */
-        return media.controller.Library.extend({
-            defaults: _.defaults({
-                id:           prop + '-library',
-                filterable:   'uploaded',
-                multiple:     'add',
-                menu:         prop,
-                toolbar:      prop + '-add',
-                priority:     100,
+     * @constructor
+     * @augments wp.media.controller.Library
+     * @augments wp.media.controller.State
+     * @augments Backbone.Model
+     */
+    media.controller.CollectionAdd = function (attributes) {
+        var ExtendedLibrary, extended = _.extend( attributes, {
+            defaults: _.defaults( {
+                id: attributes.tag + '-library',
+                title: attributes.title,
+                menu: attributes.tag,
+                toolbar: attributes.tag + '-add',
+                filterable: 'uploaded',
+                multiple:   'add',
+                priority:   100,
                 syncSelection: false
-            }, args.defaults || {}, media.controller.Library.prototype.defaults ),
+            }, media.controller.Library.prototype.defaults ),
+
             initialize: function() {
                 // If we haven't been provided a `library`, create a `Selection`.
                 if ( ! this.get('library') ) {
-                    this.set( 'library', media.query({ type: args.type }) );
+                    this.set( 'library', media.query({ type: this.type }) );
                 }
                 media.controller.Library.prototype.initialize.apply( this, arguments );
@@ -900 +896 @@
             activate: function() {
                 var library = this.get('library'),
-                    edit    = this.frame.state(prop + '-edit').get('library');
+                    edit    = this.frame.state( this.tag + '-edit' ).get('library');
 
                 if ( this.editLibrary && this.editLibrary !== edit ) {
@@ -921 +917 @@
                 media.controller.Library.prototype.activate.apply( this, arguments );
             }
-        });
+        } );
+        ExtendedLibrary = media.controller.Library.extend( extended );
+
+        return new ExtendedLibrary();
     };
 
@@ -931 +930 @@
         defaults: {
             title: l10n.editGalleryTitle
-        }
-    });
-
-    // wp.media.controller.GalleryAdd
-    // ---------------------------------
-    media.controller.GalleryAdd = media.controller.CollectionAdd( 'gallery', {
-        type: 'image',
-        defaults: {
-            title: l10n.addToGalleryTitle
         }
     });
@@ -955 +945 @@
     });
 
-    // wp.media.controller.PlaylistAdd
-    // ---------------------------------
-    media.controller.PlaylistAdd = media.controller.CollectionAdd( 'playlist', {
-        type: 'audio',
-        defaults: {
-            title: l10n.addToPlaylistTitle
-        }
-    });
-
     // wp.media.controller.VideoPlaylistEdit
     // -------------------------------
@@ -973 +954 @@
             title: l10n.editVideoPlaylistTitle,
             dragInfo : false
-        }
-    });
-
-    // wp.media.controller.VideoPlaylistAdd
-    // ---------------------------------
-    media.controller.VideoPlaylistAdd = media.controller.CollectionAdd( 'video-playlist', {
-        type: 'video',
-        defaults: {
-            title: l10n.addToVideoPlaylistTitle
         }
     });
@@ -1811 +1783 @@
                 }),
 
-                new media.controller.GalleryAdd(),
+                new media.controller.CollectionAdd({
+                    tag: 'gallery',
+                    type: 'image',
+                    title: l10n.addToGalleryTitle
+                }),
 
                 new media.controller.Library({
@@ -1834 +1810 @@
                 }),
 
-                new media.controller.PlaylistAdd(),
+                new media.controller.CollectionAdd({
+                    tag: 'playlist',
+                    type: 'audio',
+                    title: l10n.addToPlaylistTitle
+                }),
 
                 new media.controller.Library({
@@ -1857 +1837 @@
                 }),
 
-                new media.controller.VideoPlaylistAdd()
+                new media.controller.CollectionAdd({
+                    tag: 'video-playlist',
+                    type: 'video',
+                    title: l10n.addToVideoPlaylistTitle
+                })
             ]);