Changeset 22792

Timestamp:

11/21/2012 08:43:42 PM (14 years ago)

Author:

koopersmith

Message:

Media: Rename PriorityList's add/remove methods to set/unset (to prevent the default remove from being overridden). see #21390.

File:

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

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

@@ -1117 +1117 @@
                         }, this );
 
-                        this.menu.view().add( views );
+                        this.menu.view().set( views );
                 },
 
@@ -1440 +1440 @@
                         media.view.MediaFrame.Select.prototype.mainMenu.call( this, { silent: true });
 
-                        this.menu.view().add({
+                        this.menu.view().set({
                                 separateLibrary: new media.View({
                                         className: 'separator',
@@ -1539 +1539 @@
                         library.gallery = library.gallery || new Backbone.Model();
 
-                        this.sidebar.view().add({
+                        this.sidebar.view().set({
                                 gallery: new media.view.Settings.Gallery({
                                         controller: this,
@@ -1561 +1561 @@
                         });
 
-                        this.sidebar.view().add({
+                        this.sidebar.view().set({
                                 display: new media.view.Settings.AttachmentDisplay({
                                         controller:   this,
@@ -2182 +2182 @@
                         this._views     = {};
 
-                        this.add( _.extend( {}, this._views, this.options.views ), { silent: true });
+                        this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
                         delete this.options.views;
 
@@ -2210 +2210 @@
                 },
 
-                add: function( id, view, options ) {
+                set: function( id, view, options ) {
                         options = options || {};
 
@@ -2216 +2216 @@
                         if ( _.isObject( id ) ) {
                                 _.each( id, function( view, id ) {
-                                        this.add( id, view, { silent: true });
+                                        this.set( id, view, { silent: true });
                                 }, this );
 
@@ -2239 +2239 @@
                 },
 
-                remove: function( id, options ) {
+                unset: function( id, options ) {
                         delete this._views[ id ];
                         if ( ! options || ! options.silent )