sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27322 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-02-27 23:03:02 +00:00
parent 01fb070621
commit 8402d9c745
1 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/wp-includes/js/media-views.js
View File

@ -867,39 +867,35 @@
/** /**
* wp.media.controller.CollectionAdd * 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 * @constructor
* @augments wp.media.controller.Library * @augments wp.media.controller.Library
* @augments wp.media.controller.State * @augments wp.media.controller.State
* @augments Backbone.Model * @augments Backbone.Model
*/ */
return media.controller.Library.extend({ media.controller.CollectionAdd = function (attributes) {
defaults: _.defaults({ var ExtendedLibrary, extended = _.extend( attributes, {
id: prop + '-library', defaults: _.defaults( {
id: attributes.tag + '-library',
title: attributes.title,
menu: attributes.tag,
toolbar: attributes.tag + '-add',
filterable: 'uploaded', filterable: 'uploaded',
multiple: 'add', multiple: 'add',
menu: prop,
toolbar: prop + '-add',
priority: 100, priority: 100,
syncSelection: false syncSelection: false
}, args.defaults || {}, media.controller.Library.prototype.defaults ), }, media.controller.Library.prototype.defaults ),
initialize: function() { initialize: function() {
// If we haven't been provided a `library`, create a `Selection`. // If we haven't been provided a `library`, create a `Selection`.
if ( ! this.get('library') ) { 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 ); media.controller.Library.prototype.initialize.apply( this, arguments );
}, },
activate: function() { activate: function() {
var library = this.get('library'), 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 ) { if ( this.editLibrary && this.editLibrary !== edit ) {
library.unobserve( this.editLibrary ); library.unobserve( this.editLibrary );
@ -920,7 +916,10 @@
media.controller.Library.prototype.activate.apply( this, arguments ); media.controller.Library.prototype.activate.apply( this, arguments );
} }
}); } );
ExtendedLibrary = media.controller.Library.extend( extended );
return new ExtendedLibrary();
}; };
// wp.media.controller.GalleryEdit // wp.media.controller.GalleryEdit
@ -933,15 +932,6 @@
} }
}); });
// wp.media.controller.GalleryAdd
// ---------------------------------
media.controller.GalleryAdd = media.controller.CollectionAdd( 'gallery', {
type: 'image',
defaults: {
title: l10n.addToGalleryTitle
}
});
// wp.media.controller.PlaylistEdit // wp.media.controller.PlaylistEdit
// ------------------------------- // -------------------------------
media.controller.PlaylistEdit = media.controller.CollectionEdit( 'playlist', { media.controller.PlaylistEdit = media.controller.CollectionEdit( 'playlist', {
@ -954,15 +944,6 @@
} }
}); });
// wp.media.controller.PlaylistAdd
// ---------------------------------
media.controller.PlaylistAdd = media.controller.CollectionAdd( 'playlist', {
type: 'audio',
defaults: {
title: l10n.addToPlaylistTitle
}
});
// wp.media.controller.VideoPlaylistEdit // wp.media.controller.VideoPlaylistEdit
// ------------------------------- // -------------------------------
media.controller.VideoPlaylistEdit = media.controller.CollectionEdit( 'video-playlist', { media.controller.VideoPlaylistEdit = media.controller.CollectionEdit( 'video-playlist', {
@ -975,15 +956,6 @@
} }
}); });
// wp.media.controller.VideoPlaylistAdd
// ---------------------------------
media.controller.VideoPlaylistAdd = media.controller.CollectionAdd( 'video-playlist', {
type: 'video',
defaults: {
title: l10n.addToVideoPlaylistTitle
}
});
/** /**
* wp.media.controller.FeaturedImage * wp.media.controller.FeaturedImage
* *
@ -1810,7 +1782,11 @@
menu: 'gallery' menu: 'gallery'
}), }),
new media.controller.GalleryAdd(), new media.controller.CollectionAdd({
tag: 'gallery',
type: 'image',
title: l10n.addToGalleryTitle
}),
new media.controller.Library({ new media.controller.Library({
id: 'playlist', id: 'playlist',
@ -1833,7 +1809,11 @@
menu: 'playlist' menu: 'playlist'
}), }),
new media.controller.PlaylistAdd(), new media.controller.CollectionAdd({
tag: 'playlist',
type: 'audio',
title: l10n.addToPlaylistTitle
}),
new media.controller.Library({ new media.controller.Library({
id: 'video-playlist', id: 'video-playlist',
@ -1856,7 +1836,11 @@
menu: 'video-playlist' menu: 'video-playlist'
}), }),
new media.controller.VideoPlaylistAdd() new media.controller.CollectionAdd({
tag: 'video-playlist',
type: 'video',
title: l10n.addToVideoPlaylistTitle
})
]); ]);