<!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>[22888] trunk/wp-includes/js/media-views.js: Ensure attachment modal details are saved before the attachment details view is destroyed.</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/22888">22888</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-28 02:03:31 +0000 (Wed, 28 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure attachment modal details are saved before the attachment details view is destroyed. props koopersmith. fixes <a href="http://core.trac.wordpress.org/ticket/22593">#22593</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22887 => 22888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-28 01:51:15 UTC (rev 22887)
+++ trunk/wp-includes/js/media-views.js 2012-11-28 02:03:31 UTC (rev 22888)
</span><span class="lines">@@ -814,13 +814,15 @@
</span><span class="cx"> selector = '';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ views = views || [];
+
</ins><span class="cx"> if ( existing = this.get( selector ) ) {
</span><span class="cx"> views = _.isArray( views ) ? views : [ views ];
</span><span class="cx"> this._views[ selector ] = views.length ? _.difference( existing, views ) : [];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! options || ! options.silent )
</span><del>- _.invoke( views, 'dispose', { silent: true });
</del><ins>+ _.invoke( views, 'dispose' );
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -1014,10 +1016,13 @@
</span><span class="cx"> render: function() {
</span><span class="cx"> var options;
</span><span class="cx">
</span><ins>+ if ( this.prepare )
+ options = this.prepare();
+
</ins><span class="cx"> this.views.detach();
</span><span class="cx">
</span><span class="cx"> if ( this.template ) {
</span><del>- options = this.prepare ? this.prepare() : {};
</del><ins>+ options = options || {};
</ins><span class="cx"> this.trigger( 'prepare', options );
</span><span class="cx"> this.$el.html( this.template( options ) );
</span><span class="cx"> }
</span><span class="lines">@@ -2433,9 +2438,10 @@
</span><span class="cx"> this.details( this.model, this.controller.state().get('selection') );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- destroy: function() {
- this.model.off( null, null, this );
- this.remove();
</del><ins>+ dispose: function() {
+ this.updateAll();
+ media.View.prototype.dispose.apply( this, arguments );
+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><span class="lines">@@ -2462,6 +2468,7 @@
</span><span class="cx"> if ( 'image' === options.type )
</span><span class="cx"> options.size = this.imageSize();
</span><span class="cx">
</span><ins>+ this.views.detach();
</ins><span class="cx"> this.$el.html( this.template( options ) );
</span><span class="cx">
</span><span class="cx"> this.$el.toggleClass( 'uploading', options.uploading );
</span><span class="lines">@@ -2474,6 +2481,7 @@
</span><span class="cx"> if ( this.selected() )
</span><span class="cx"> this.select();
</span><span class="cx">
</span><ins>+ this.views.render();
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -2571,6 +2579,30 @@
</span><span class="cx"> this.model.save( $setting.data('setting'), event.target.value );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ updateAll: function() {
+ var $settings = this.$('[data-setting]'),
+ model = this.model,
+ changed;
+
+ changed = _.chain( $settings ).map( function( el ) {
+ var $input = $('input, textarea, select, [value]', el ),
+ setting, value;
+
+ if ( ! $input.length )
+ return;
+
+ setting = $(el).data('setting');
+ value = $input.val();
+
+ // Record the value if it changed.
+ if ( model.get( setting ) !== value )
+ return [ setting, value ];
+ }).compact().object().value();
+
+ if ( changed )
+ model.save( changed );
+ },
+
</ins><span class="cx"> removeFromLibrary: function( event ) {
</span><span class="cx"> // Stop propagation so the model isn't selected.
</span><span class="cx"> event.stopPropagation();
</span><span class="lines">@@ -2614,8 +2646,9 @@
</span><span class="cx"> media.view.Attachments = media.View.extend({
</span><span class="cx"> tagName: 'ul',
</span><span class="cx"> className: 'attachments',
</span><del>- template: media.template('attachments-css'),
</del><span class="cx">
</span><ins>+ cssTemplate: media.template('attachments-css'),
+
</ins><span class="cx"> events: {
</span><span class="cx"> 'scroll': 'scroll'
</span><span class="cx"> },
</span><span class="lines">@@ -2631,12 +2664,22 @@
</span><span class="cx"> sortable: false
</span><span class="cx"> });
</span><span class="cx">
</span><del>- _.each(['add','remove'], function( method ) {
- this.collection.on( method, function( attachment, attachments, options ) {
- this[ method ]( attachment, options.index );
- }, this );
</del><ins>+ this._viewsByCid = {};
+
+ this.collection.on( 'add', function( attachment, attachments, options ) {
+ this.views.add( this.createAttachmentView( attachment ), {
+ at: options.index
+ });
</ins><span class="cx"> }, this );
</span><span class="cx">
</span><ins>+ this.collection.on( 'remove', function( attachment, attachments, options ) {
+ var view = this._viewsByCid[ attachment.cid ];
+ delete this._viewsByCid[ attachment.cid ];
+
+ if ( view )
+ view.remove();
+ }, this );
+
</ins><span class="cx"> this.collection.on( 'reset', this.render, this );
</span><span class="cx">
</span><span class="cx"> // Throttle the scroll handler.
</span><span class="lines">@@ -2664,7 +2707,7 @@
</span><span class="cx"> if ( $css.length )
</span><span class="cx"> $css.remove();
</span><span class="cx">
</span><del>- media.view.Attachments.$head().append( this.template({
</del><ins>+ media.view.Attachments.$head().append( this.cssTemplate({
</ins><span class="cx"> id: this.el.id,
</span><span class="cx"> edge: this.edge(),
</span><span class="cx"> gutter: this.model.get('gutter')
</span><span class="lines">@@ -2739,26 +2782,28 @@
</span><span class="cx"> this.$el.sortable( 'option', 'disabled', !! this.collection.comparator );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- render: function() {
- // If there are no elements, load some.
- if ( ! this.collection.length ) {
- this.collection.more().done( this.scroll );
- this.$el.empty();
- return this;
- }
</del><ins>+ createAttachmentView: function( attachment ) {
+ var view = new this.options.AttachmentView({
+ controller: this.controller,
+ model: attachment,
+ collection: this.collection,
+ selection: this.options.selection
+ });
</ins><span class="cx">
</span><del>- // Otherwise, create all of the Attachment views, and replace
</del><ins>+ return this._viewsByCid[ attachment.cid ] = view;
+ },
+
+ prepare: function() {
+ // Create all of the Attachment views, and replace
</ins><span class="cx"> // the list in a single DOM operation.
</span><del>- this.$el.html( this.collection.map( function( attachment ) {
- return new this.options.AttachmentView({
- controller: this.controller,
- model: attachment,
- collection: this.collection,
- selection: this.options.selection
- }).render().$el;
- }, this ) );
</del><ins>+ if ( this.collection.length ) {
+ this.views.set( this.collection.map( this.createAttachmentView, this ) );
</ins><span class="cx">
</span><del>- return this;
</del><ins>+ // If there are no elements, clear the views and load some.
+ } else {
+ this.views.unset();
+ this.collection.more().done( this.scroll );
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> ready: function() {
</span><span class="lines">@@ -2767,30 +2812,6 @@
</span><span class="cx"> this.scroll();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- add: function( attachment, index ) {
- var view, children;
-
- view = new this.options.AttachmentView({
- controller: this.controller,
- model: attachment,
- collection: this.collection,
- selection: this.options.selection
- }).render();
-
- children = this.$el.children();
-
- if ( children.length > index )
- children.eq( index ).before( view.$el );
- else
- this.$el.append( view.$el );
- },
-
- remove: function( attachment, index ) {
- var children = this.$el.children();
- if ( children.length )
- children.eq( index ).detach();
- },
-
</del><span class="cx"> scroll: function( event ) {
</span><span class="cx"> // @todo: is this still necessary?
</span><span class="cx"> if ( ! this.$el.is(':visible') )
</span></span></pre>
</div>
</div>
</body>
</html>