<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28048] trunk/src/wp-includes/js/media-views.js: Restore `GalleryAdd()` and `GalleryEdit()` in `media-views.js` to ensure back-compat.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28048">28048</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-04-08 15:53:42 +0000 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore `GalleryAdd()` and `GalleryEdit()` in `media-views.js` to ensure back-compat.
See <a href="http://core.trac.wordpress.org/changeset/27362">[27362]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (28047 => 28048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-04-08 12:34:10 UTC (rev 28047)
+++ trunk/src/wp-includes/js/media-views.js 2014-04-08 15:53:42 UTC (rev 28048)
</span><span class="lines">@@ -769,6 +769,150 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * wp.media.controller.GalleryEdit
+ *
+ * @constructor
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+ media.controller.GalleryEdit = media.controller.Library.extend({
+ defaults: {
+ id: 'gallery-edit',
+ multiple: false,
+ describe: true,
+ edge: 199,
+ editing: false,
+ sortable: true,
+ searchable: false,
+ toolbar: 'gallery-edit',
+ content: 'browse',
+ title: l10n.editGalleryTitle,
+ priority: 60,
+ dragInfo: true,
+
+ // Don't sync the selection, as the Edit Gallery library
+ // *is* the selection.
+ syncSelection: false
+ },
+
+ initialize: function() {
+ // If we haven't been provided a `library`, create a `Selection`.
+ if ( ! this.get('library') )
+ this.set( 'library', new media.model.Selection() );
+
+ // The single `Attachment` view to be used in the `Attachments` view.
+ if ( ! this.get('AttachmentView') )
+ this.set( 'AttachmentView', media.view.Attachment.EditLibrary );
+ media.controller.Library.prototype.initialize.apply( this, arguments );
+ },
+
+ activate: function() {
+ var library = this.get('library');
+
+ // Limit the library to images only.
+ library.props.set( 'type', 'image' );
+
+ // Watch for uploaded attachments.
+ this.get('library').observe( wp.Uploader.queue );
+
+ this.frame.on( 'content:render:browse', this.gallerySettings, this );
+
+ media.controller.Library.prototype.activate.apply( this, arguments );
+ },
+
+ deactivate: function() {
+ // Stop watching for uploaded attachments.
+ this.get('library').unobserve( wp.Uploader.queue );
+
+ this.frame.off( 'content:render:browse', this.gallerySettings, this );
+
+ media.controller.Library.prototype.deactivate.apply( this, arguments );
+ },
+
+ gallerySettings: function( browser ) {
+ var library = this.get('library');
+
+ if ( ! library || ! browser )
+ return;
+
+ library.gallery = library.gallery || new Backbone.Model();
+
+ browser.sidebar.set({
+ gallery: new media.view.Settings.Gallery({
+ controller: this,
+ model: library.gallery,
+ priority: 40
+ })
+ });
+
+ browser.toolbar.set( 'reverse', {
+ text: l10n.reverseOrder,
+ priority: 80,
+
+ click: function() {
+ library.reset( library.toArray().reverse() );
+ }
+ });
+ }
+ });
+
+ /**
+ * wp.media.controller.GalleryAdd
+ *
+ * @constructor
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+ media.controller.GalleryAdd = media.controller.Library.extend({
+ defaults: _.defaults({
+ id: 'gallery-library',
+ filterable: 'uploaded',
+ multiple: 'add',
+ menu: 'gallery',
+ toolbar: 'gallery-add',
+ title: l10n.addToGalleryTitle,
+ priority: 100,
+
+ // Don't sync the selection, as the Edit Gallery library
+ // *is* the selection.
+ syncSelection: false
+ }, 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: 'image' }) );
+
+ media.controller.Library.prototype.initialize.apply( this, arguments );
+ },
+
+ activate: function() {
+ var library = this.get('library'),
+ edit = this.frame.state('gallery-edit').get('library');
+
+ if ( this.editLibrary && this.editLibrary !== edit )
+ library.unobserve( this.editLibrary );
+
+ // Accepts attachments that exist in the original library and
+ // that do not exist in gallery's library.
+ library.validator = function( attachment ) {
+ return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && media.model.Selection.prototype.validator.apply( this, arguments );
+ };
+
+ // Reset the library to ensure that all attachments are re-added
+ // to the collection. Do so silently, as calling `observe` will
+ // trigger the `reset` event.
+ library.reset( library.mirroring.models, { silent: true });
+ library.observe( edit );
+ this.editLibrary = edit;
+
+ media.controller.Library.prototype.activate.apply( this, arguments );
+ }
+ });
+
+ /**
</ins><span class="cx"> * wp.media.controller.CollectionEdit
</span><span class="cx"> *
</span><span class="cx"> * @constructor
</span><span class="lines">@@ -1961,21 +2105,13 @@
</span><span class="cx"> new media.controller.EditImage( { model: options.editImage } ),
</span><span class="cx">
</span><span class="cx"> // Gallery states.
</span><del>- new media.controller.CollectionEdit({
- type: 'image',
- collectionType: 'gallery',
- title: l10n.editGalleryTitle,
- SettingsView: media.view.Settings.Gallery,
- library: options.selection,
- editing: options.editing,
- menu: 'gallery'
</del><ins>+ new media.controller.GalleryEdit({
+ library: options.selection,
+ editing: options.editing,
+ menu: 'gallery'
</ins><span class="cx"> }),
</span><span class="cx">
</span><del>- new media.controller.CollectionAdd({
- type: 'image',
- collectionType: 'gallery',
- title: l10n.addToGalleryTitle
- }),
</del><ins>+ new media.controller.GalleryAdd(),
</ins><span class="cx">
</span><span class="cx"> new media.controller.Library({
</span><span class="cx"> id: 'playlist',
</span></span></pre>
</div>
</div>
</body>
</html>