<!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>[29686] trunk/src/wp-includes: Media: Avoid repeated thumbnail resizing.</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/29686">29686</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-09-03 06:09:33 +0000 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Avoid repeated thumbnail resizing.
props avryl, wonderboymusic, azaozz.
fixes <a href="http://core.trac.wordpress.org/ticket/27423">#27423</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29685 => 29686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-09-03 05:37:33 UTC (rev 29685)
+++ trunk/src/wp-includes/css/media-views.css 2014-09-03 06:09:33 UTC (rev 29686)
</span><span class="lines">@@ -2511,50 +2511,50 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="1"] .attachment {
</del><ins>+.media-frame-content[data-columns="1"] .attachment {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="2"] .attachment {
</del><ins>+.media-frame-content[data-columns="2"] .attachment {
</ins><span class="cx"> width: 50%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="3"] .attachment {
</del><ins>+.media-frame-content[data-columns="3"] .attachment {
</ins><span class="cx"> width: 33.3%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="4"] .attachment {
</del><ins>+.media-frame-content[data-columns="4"] .attachment {
</ins><span class="cx"> width: 25%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="5"] .attachment {
</del><ins>+.media-frame-content[data-columns="5"] .attachment {
</ins><span class="cx"> width: 20%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="6"] .attachment {
</del><ins>+.media-frame-content[data-columns="6"] .attachment {
</ins><span class="cx"> width: 16.6%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="7"] .attachment {
</del><ins>+.media-frame-content[data-columns="7"] .attachment {
</ins><span class="cx"> width: 14.2%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="8"] .attachment {
</del><ins>+.media-frame-content[data-columns="8"] .attachment {
</ins><span class="cx"> width: 12.5%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="9"] .attachment {
</del><ins>+.media-frame-content[data-columns="9"] .attachment {
</ins><span class="cx"> width: 11.1%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="10"] .attachment {
</del><ins>+.media-frame-content[data-columns="10"] .attachment {
</ins><span class="cx"> width: 10%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="11"] .attachment {
</del><ins>+.media-frame-content[data-columns="11"] .attachment {
</ins><span class="cx"> width: 9%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments[data-columns="12"] .attachment {
</del><ins>+.media-frame-content[data-columns="12"] .attachment {
</ins><span class="cx"> width: 8.3%;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29685 => 29686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-09-03 05:37:33 UTC (rev 29685)
+++ trunk/src/wp-includes/js/media-views.js 2014-09-03 06:09:33 UTC (rev 29686)
</span><span class="lines">@@ -5199,6 +5199,8 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this._viewsByCid = {};
</span><ins>+ this.$window = $( window );
+ this.resizeEvent = 'resize.media-modal-columns';
</ins><span class="cx">
</span><span class="cx"> this.collection.on( 'add', function( attachment ) {
</span><span class="cx"> this.views.add( this.createAttachmentView( attachment ), {
</span><span class="lines">@@ -5230,13 +5232,17 @@
</span><span class="cx"> _.bindAll( this, 'setColumns' );
</span><span class="cx">
</span><span class="cx"> if ( this.options.resize ) {
</span><del>- $( window ).on( 'resize.media-modal-columns', this.setColumns );
</del><ins>+ this.on( 'ready', this.bindEvents );
</ins><span class="cx"> this.controller.on( 'open', this.setColumns );
</span><ins>+
+ // Call this.setColumns() after this view has been rendered in the DOM so
+ // attachments get proper width applied.
+ _.defer( this.setColumns, this );
</ins><span class="cx"> }
</span><ins>+ },
</ins><span class="cx">
</span><del>- // Call this.setColumns() after this view has been rendered in the DOM so
- // attachments get proper width applied.
- _.defer( this.setColumns, this );
</del><ins>+ bindEvents: function() {
+ this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> attachmentFocus: function() {
</span><span class="lines">@@ -5249,7 +5255,7 @@
</span><span class="cx">
</span><span class="cx"> arrowEvent: function( event ) {
</span><span class="cx"> var attachments = this.$el.children( 'li' ),
</span><del>- perRow = this.$el.data( 'columns' ),
</del><ins>+ perRow = this.columns,
</ins><span class="cx"> index = attachments.filter( ':focus' ).index(),
</span><span class="cx"> row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
</span><span class="cx">
</span><span class="lines">@@ -5292,7 +5298,9 @@
</span><span class="cx">
</span><span class="cx"> dispose: function() {
</span><span class="cx"> this.collection.props.off( null, null, this );
</span><del>- $( window ).off( 'resize.media-modal-columns' );
</del><ins>+ if ( this.options.resize ) {
+ this.$window.off( this.resizeEvent );
+ }
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * call 'dispose' directly on the parent class
</span><span class="lines">@@ -5308,7 +5316,7 @@
</span><span class="cx"> this.columns = Math.min( Math.round( width / this.options.idealColumnWidth ), 12 ) || 1;
</span><span class="cx">
</span><span class="cx"> if ( ! prev || prev !== this.columns ) {
</span><del>- this.$el.attr( 'data-columns', this.columns );
</del><ins>+ this.$el.closest( '.media-frame-content' ).attr( 'data-columns', this.columns );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>