Changeset 21901

Timestamp:

09/18/2012 10:41:51 PM (14 years ago)

Author:

koopersmith

Message:

Media JS: Improve signature for Workspace.add() to accept two arguments instead of an ambiguous object. see #21390, [21820], [21821].

File:

• trunk/wp-includes/js/media-views.js (modified) (1 diff)

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

@@ -36 +36 @@
 
 
-                // Accepts an `id` and `options` for a view.
+                // Registers a view.
                 //
-                // `options` is either a `Backbone.View` constructor or an object that
-                // contains two keys: the `view` key is a `Backbone.View` constructor,
-                // and the `options` key are the options to be passed when the view is
-                // initialized.
+                // `id` is a unique ID for the view relative to the workflow instance.
+                // `constructor` is a `Backbone.View` constructor. `options` are the
+                // options to be passed when the view is initialized.
                 //
                 // Triggers the `add` and `add:VIEW_ID` events.
-                add: function( id, options ) {
+                add: function( id, constructor, options ) {
                         this.remove( id );
-                        if ( _.isFunction( options ) )
-                                options = { view: options };
-                        this._pending[ id ] = options;
-                        this.trigger( 'add add:' + id, options );
+                        this._pending[ id ] = {
+                                view:    constructor,
+                                options: options
+                        };
+                        this.trigger( 'add add:' + id, constructor, options );
                         return this;
                 },