<!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>[22760] trunk/wp-admin/js/media-upload.js: Media: Use the wp.media.string functions when generating embed strings.</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/22760">22760</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-21 14:20:01 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Use the wp.media.string functions when generating embed strings. Embed captions now work. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsmediauploadjs">trunk/wp-admin/js/media-upload.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 (22759 => 22760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-11-21 14:04:24 UTC (rev 22759)
+++ trunk/wp-admin/js/media-upload.js 2012-11-21 14:20:01 UTC (rev 22760)
</span><span class="lines">@@ -148,7 +148,8 @@
</span><span class="cx">
</span><span class="cx"> props = _.defaults( props || {}, {
</span><span class="cx"> align: getUserSetting( 'align', 'none' ),
</span><del>- size: getUserSetting( 'imgsize', 'medium' )
</del><ins>+ size: getUserSetting( 'imgsize', 'medium' ),
+ url: ''
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if ( attachment ) {
</span><span class="lines">@@ -168,9 +169,8 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- img.width = size.width;
- img.height = size.height;
- img.src = size.url;
</del><ins>+ img.src = props.url;
+ _.extend( img, _.pick( props, 'width', 'height', 'alt' ) );
</ins><span class="cx">
</span><span class="cx"> // Only assign the align class to the image if we're not printing
</span><span class="cx"> // a caption, since the alignment is sent to the shortcode.
</span><span class="lines">@@ -204,10 +204,11 @@
</span><span class="cx">
</span><span class="cx"> // Generate the caption shortcode.
</span><span class="cx"> if ( props.caption ) {
</span><del>- shortcode = {
- width: img.width
- };
</del><ins>+ shortcode = {};
</ins><span class="cx">
</span><ins>+ if ( img.width )
+ shortcode.width = img.width;
+
</ins><span class="cx"> if ( props.captionId )
</span><span class="cx"> shortcode.id = props.captionId;
</span><span class="cx">
</span><span class="lines">@@ -408,48 +409,32 @@
</span><span class="cx"> }, this );
</span><span class="cx">
</span><span class="cx"> workflow.get('embed').on( 'select', function() {
</span><del>- var embed = workflow.state().toJSON(),
- options;
</del><ins>+ var embed = workflow.state().toJSON();
</ins><span class="cx">
</span><ins>+ embed.url = embed.url || '';
+
</ins><span class="cx"> if ( 'link' === embed.type ) {
</span><del>- this.insert( wp.html.string({
- tag: 'a',
- content: embed.title || embed.url,
- attrs: {
- href: embed.url
- }
- }) );
</del><ins>+ _.defaults( embed, {
+ title: embed.url,
+ linkUrl: embed.url
+ });
</ins><span class="cx">
</span><ins>+ this.insert( wp.media.string.link( embed ) );
+
</ins><span class="cx"> } else if ( 'image' === embed.type ) {
</span><span class="cx"> _.defaults( embed, {
</span><del>- align: 'none',
- url: '',
- alt: '',
</del><ins>+ title: embed.url,
</ins><span class="cx"> linkUrl: '',
</span><ins>+ align: 'none',
</ins><span class="cx"> link: 'none'
</span><span class="cx"> });
</span><span class="cx">
</span><del>- options = {
- single: true,
- tag: 'img',
- attrs: {
- 'class': 'align' + embed.align,
- src: embed.url,
- alt: embed.alt
- }
- };
</del><ins>+ if ( 'none' === embed.link )
+ embed.linkUrl = '';
+ else if ( 'file' === embed.link )
+ embed.linkUrl = embed.url;
</ins><span class="cx">
</span><del>- if ( 'custom' === embed.link || 'file' === embed.link ) {
- options = {
- tag: 'a',
- content: options,
- attrs: {
- href: 'custom' === embed.link ? embed.linkUrl : embed.url
- }
- };
- }
-
- this.insert( wp.html.string( options ) );
</del><ins>+ this.insert( wp.media.string.image( embed ) );
</ins><span class="cx"> }
</span><span class="cx"> }, this );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>