<!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>[22046] trunk/wp-includes: Media JS: Use a custom Attachment views for both the media library and gallery screens.</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, #logmsg > ol { margin-left: 0; 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/22046">22046</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-27 06:53:54 +0000 (Thu, 27 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media JS: Use a custom Attachment views for both the media library and gallery screens.
To do so, the Attachment view code had to be shifted above the Workspace view code to ensure the subview is defined (preventing errors).
Also corrects an error in `wp.media.view.Attachments.add` where it was still using the default Attachment view.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21809">#21809</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22045 => 22046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-09-27 06:39:12 UTC (rev 22045)
+++ trunk/wp-includes/css/media-views.css 2012-09-27 06:53:54 UTC (rev 22046)
</span><span class="lines">@@ -248,11 +248,11 @@
</span><span class="cx"> border-color: #d54e21;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment.selected {
</del><ins>+.attachment.library.selected {
</ins><span class="cx"> border-color: #21759b;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment.selected:after {
</del><ins>+.attachment.library.selected:after {
</ins><span class="cx"> content: '\2713';
</span><span class="cx"> display: block;
</span><span class="cx"> height: 24px;
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22045 => 22046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-09-27 06:39:12 UTC (rev 22045)
+++ trunk/wp-includes/js/media-views.js 2012-09-27 06:53:54 UTC (rev 22046)
</span><span class="lines">@@ -367,6 +367,102 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * wp.media.view.Attachment
+ */
+ media.view.Attachment = Backbone.View.extend({
+ tagName: 'li',
+ className: 'attachment',
+ template: media.template('attachment'),
+
+ events: {
+ 'click': 'toggleSelection'
+ },
+
+ initialize: function() {
+ this.controller = this.options.controller;
+
+ this.model.on( 'change:sizes change:uploading', this.render, this );
+ this.model.on( 'change:percent', this.progress, this );
+ this.model.on( 'add', this.select, this );
+ this.model.on( 'remove', this.deselect, this );
+ },
+
+ render: function() {
+ var attachment = this.model.toJSON(),
+ options = {
+ thumbnail: 'image' === attachment.type ? attachment.url : attachment.icon,
+ uploading: attachment.uploading,
+ orientation: attachment.orientation || 'landscape',
+ type: attachment.type,
+ subtype: attachment.subtype
+ };
+
+ // Use the medium image size if possible. If the medium size
+ // doesn't exist, then the attachment is too small.
+ // In that case, use the attachment itself.
+ if ( attachment.sizes && attachment.sizes.medium ) {
+ options.orientation = attachment.sizes.medium.orientation;
+ options.thumbnail = attachment.sizes.medium.url;
+ }
+
+ this.$el.html( this.template( options ) );
+
+ if ( attachment.uploading )
+ this.$bar = this.$('.media-progress-bar div');
+ else
+ delete this.$bar;
+
+ // Check if the model is selected.
+ if ( this.controller.selection.has( this.model ) )
+ this.select();
+
+ return this;
+ },
+
+ progress: function() {
+ if ( this.$bar && this.$bar.length )
+ this.$bar.width( this.model.get('percent') + '%' );
+ },
+
+ toggleSelection: function( event ) {
+ var selection = this.controller.selection;
+ selection[ selection.has( this.model ) ? 'remove' : 'add' ]( this.model );
+ },
+
+ select: function( model, collection ) {
+ // If a collection is provided, check if it's the selection.
+ // If it's not, bail; we're in another selection's event loop.
+ if ( collection && collection !== this.controller.selection )
+ return;
+
+ this.$el.addClass('selected');
+ },
+
+ deselect: function( model, collection ) {
+ // If a collection is provided, check if it's the selection.
+ // If it's not, bail; we're in another selection's event loop.
+ if ( collection && collection !== this.controller.selection )
+ return;
+
+ this.$el.removeClass('selected');
+ }
+ });
+
+ /**
+ * wp.media.view.Attachment.Library
+ */
+ media.view.Attachment.Library = media.view.Attachment.extend({
+ className: 'attachment library'
+ });
+
+ /**
+ * wp.media.view.Attachment.Gallery
+ */
+ media.view.Attachment.Gallery = media.view.Attachment.extend({
+ events: {}
+ });
+
+ /**
</ins><span class="cx"> * wp.media.view.Workspace
</span><span class="cx"> */
</span><span class="cx"> media.view.Workspace = Backbone.View.extend({
</span><span class="lines">@@ -457,7 +553,7 @@
</span><span class="cx"> */
</span><span class="cx"> media.view.Workspace.Library = media.view.Workspace.extend({
</span><span class="cx"> // The single `Attachment` view to be used in the `Attachments` view.
</span><del>- // AttachmentView: media.view.Attachment.Library,
</del><ins>+ AttachmentView: media.view.Attachment.Library,
</ins><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="cx"> media.view.Workspace.prototype.initialize.apply( this, arguments );
</span><span class="lines">@@ -530,7 +626,7 @@
</span><span class="cx"> */
</span><span class="cx"> media.view.Workspace.Gallery = media.view.Workspace.extend({
</span><span class="cx"> // The single `Attachment` view to be used in the `Attachments` view.
</span><del>- // AttachmentView: media.view.Attachment.Gallery,
</del><ins>+ AttachmentView: media.view.Attachment.Gallery,
</ins><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="cx"> media.view.Workspace.prototype.initialize.apply( this, arguments );
</span><span class="lines">@@ -646,7 +742,7 @@
</span><span class="cx"> add: function( attachment, index ) {
</span><span class="cx"> var view, children;
</span><span class="cx">
</span><del>- view = new media.view.Attachment({
</del><ins>+ view = new this.options.AttachmentView({
</ins><span class="cx"> controller: this.controller,
</span><span class="cx"> model: attachment
</span><span class="cx"> }).render();
</span><span class="lines">@@ -685,90 +781,7 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><del>- * wp.media.view.Attachment
- */
- media.view.Attachment = Backbone.View.extend({
- tagName: 'li',
- className: 'attachment',
- template: media.template('attachment'),
-
- events: {
- 'click': 'toggleSelection'
- },
-
- initialize: function() {
- this.controller = this.options.controller;
-
- this.model.on( 'change:sizes change:uploading', this.render, this );
- this.model.on( 'change:percent', this.progress, this );
- this.model.on( 'add', this.select, this );
- this.model.on( 'remove', this.deselect, this );
- },
-
- render: function() {
- var attachment = this.model.toJSON(),
- options = {
- thumbnail: 'image' === attachment.type ? attachment.url : attachment.icon,
- uploading: attachment.uploading,
- orientation: attachment.orientation || 'landscape',
- type: attachment.type,
- subtype: attachment.subtype
- };
-
- // Use the medium image size if possible. If the medium size
- // doesn't exist, then the attachment is too small.
- // In that case, use the attachment itself.
- if ( attachment.sizes && attachment.sizes.medium ) {
- options.orientation = attachment.sizes.medium.orientation;
- options.thumbnail = attachment.sizes.medium.url;
- }
-
- this.$el.html( this.template( options ) );
-
- if ( attachment.uploading )
- this.$bar = this.$('.media-progress-bar div');
- else
- delete this.$bar;
-
- // Check if the model is selected.
- if ( this.controller.selection.has( this.model ) )
- this.select();
-
- return this;
- },
-
- progress: function() {
- if ( this.$bar && this.$bar.length )
- this.$bar.width( this.model.get('percent') + '%' );
- },
-
- toggleSelection: function( event ) {
- var selection = this.controller.selection;
- selection[ selection.has( this.model ) ? 'remove' : 'add' ]( this.model );
- },
-
- select: function( model, collection ) {
- // If a collection is provided, check if it's the selection.
- // If it's not, bail; we're in another selection's event loop.
- if ( collection && collection !== this.controller.selection )
- return;
-
- this.$el.addClass('selected');
- },
-
- deselect: function( model, collection ) {
- // If a collection is provided, check if it's the selection.
- // If it's not, bail; we're in another selection's event loop.
- if ( collection && collection !== this.controller.selection )
- return;
-
- this.$el.removeClass('selected');
- }
- });
-
- /**
</del><span class="cx"> * wp.media.view.SelectionPreview
</span><span class="cx"> */
</span><span class="cx"> media.view.SelectionPreview = Backbone.View.extend({
</span></span></pre>
</div>
</div>
</body>
</html>