<!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>[22220] trunk: Properly align MCE attachment views.</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/22220">22220</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-12 18:36:21 +0000 (Fri, 12 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly align MCE attachment views.
* Adds a `$wrapper` property to MCE views to allow them to manipulate the wrapper on render. This should be used sparingly ?\226?\128?\148?\194?\160only for layout changes that cannot be accomplished through altering the wrapper's children ?\226?\128?\148?\194?\160and likely only for adding/removing classes.
* Uses `wp.html.string()` in `wp.mce.view.toView()`.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21812">#21812</a>, <a href="http://core.trac.wordpress.org/ticket/21813">#21813</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsmediauploadjs">trunk/wp-admin/js/media-upload.js</a></li>
<li><a href="#trunkwpincludesjsmceviewjs">trunk/wp-includes/js/mce-view.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsmediauploadjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/media-upload.js (22219 => 22220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-10-12 18:32:12 UTC (rev 22219)
+++ trunk/wp-admin/js/media-upload.js 2012-10-12 18:36:21 UTC (rev 22220)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> workflow.on( 'update:insert', function( selection ) {
</span><span class="cx"> this.insert( selection.map( function( attachment ) {
</span><span class="cx"> if ( 'image' === attachment.get('type') )
</span><del>- return '\n' + wp.media.string.image( attachment ) + '\n';
</del><ins>+ return wp.media.string.image( attachment ) + ' ';
</ins><span class="cx"> else
</span><span class="cx"> return wp.media.string.link( attachment ) + ' ';
</span><span class="cx"> }).join('') );
</span></span></pre></div>
<a id="trunkwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.js (22219 => 22220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.js 2012-10-12 18:32:12 UTC (rev 22219)
+++ trunk/wp-includes/js/mce-view.js 2012-10-12 18:36:21 UTC (rev 22220)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> toView: function( viewType, options ) {
</span><span class="cx"> var view = wp.mce.view.get( viewType ),
</span><del>- instance, id, tag;
</del><ins>+ instance, id;
</ins><span class="cx">
</span><span class="cx"> if ( ! view )
</span><span class="cx"> return '';
</span><span class="lines">@@ -296,10 +296,20 @@
</span><span class="cx"> id = instance.el.id = instance.el.id || _.uniqueId('__wpmce-');
</span><span class="cx"> instances[ id ] = instance;
</span><span class="cx">
</span><del>- // If the view is a span, wrap it in a span.
- tag = 'span' === instance.tagName ? 'span' : 'div';
</del><ins>+ // Create a dummy `$wrapper` property to allow `$wrapper` to be
+ // called in the view's `render` method without a conditional.
+ instance.$wrapper = $();
</ins><span class="cx">
</span><del>- return '<' + tag + ' class="wp-view-wrap" data-wp-view="' + id + '" contenteditable="false"></' + tag + '>';
</del><ins>+ return wp.html.string({
+ // If the view is a span, wrap it in a span.
+ tag: 'span' === instance.tagName ? 'span' : 'div',
+
+ attrs: {
+ 'class': 'wp-view-wrap wp-view-type-' + viewType,
+ 'data-wp-view': id,
+ 'contenteditable': false
+ }
+ });
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // ### render( scope )
</span><span class="lines">@@ -316,6 +326,8 @@
</span><span class="cx"> if ( ! view )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Link the real wrapper to the view.
+ view.$wrapper = wrapper;
</ins><span class="cx"> // Render the view.
</span><span class="cx"> view.render();
</span><span class="cx"> // Detach the view element to ensure events are not unbound.
</span><span class="lines">@@ -543,6 +555,11 @@
</span><span class="cx"> if ( ! attachment.url )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Align the wrapper.
+ if ( this.align )
+ this.$wrapper.addClass( 'align' + this.align );
+
+ // Generate the template options.
</ins><span class="cx"> options = {
</span><span class="cx"> url: 'image' === attachment.type ? attachment.url : attachment.icon,
</span><span class="cx"> uploading: attachment.uploading
</span></span></pre>
</div>
</div>
</body>
</html>