<!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>[22758] trunk/wp-admin/js/media-upload.js: Media: Make the attachment object optional when using the wp.media.string methods.</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/22758">22758</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-21 13:53:15 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Make the attachment object optional when using the wp.media.string methods. 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 (22757 => 22758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-11-21 13:32:26 UTC (rev 22757)
+++ trunk/wp-admin/js/media-upload.js 2012-11-21 13:53:15 UTC (rev 22758)
</span><span class="lines">@@ -94,14 +94,14 @@
</span><span class="cx"> var workflows = {},
</span><span class="cx"> linkToUrl;
</span><span class="cx">
</span><del>- linkToUrl = function( attachment, props ) {
- var link = props.link,
</del><ins>+ linkToUrl = function( props, attachment ) {
+ var link = props.link || getUserSetting( 'urlbutton', 'post' ),
</ins><span class="cx"> url;
</span><span class="cx">
</span><span class="cx"> if ( 'file' === link )
</span><del>- url = attachment.get('url');
</del><ins>+ url = attachment.url;
</ins><span class="cx"> else if ( 'post' === link )
</span><del>- url = attachment.get('link');
</del><ins>+ url = attachment.link;
</ins><span class="cx"> else if ( 'custom' === link )
</span><span class="cx"> url = props.linkUrl;
</span><span class="cx">
</span><span class="lines">@@ -109,42 +109,63 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> wp.media.string = {
</span><del>- link: function( attachment, props ) {
- var linkTo = getUserSetting( 'urlbutton', 'post' ),
- options = {
- tag: 'a',
- content: attachment.get('title') || attachment.get('filename'),
- attrs: {
- rel: 'attachment wp-att-' + attachment.id
- }
- };
</del><ins>+ link: function( props, attachment ) {
+ var options;
</ins><span class="cx">
</span><del>- options.attrs.href = linkToUrl( attachment, props );
</del><ins>+ props = _.defaults( props || {}, {
+ title: '',
+ linkUrl: ''
+ });
</ins><span class="cx">
</span><ins>+ if ( attachment ) {
+ attachment = attachment.toJSON();
+
+ _.extend( props, {
+ title: attachment.title || attachment.filename,
+ linkUrl: linkToUrl( props, attachment ),
+ rel: 'attachment wp-att-' + attachment.id
+ });
+ }
+
+ options = {
+ tag: 'a',
+ content: props.title,
+ attrs: {
+ href: props.linkUrl
+ }
+ };
+
+ if ( props.rel )
+ options.attrs.rel = props.rel;
+
</ins><span class="cx"> return wp.html.string( options );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- image: function( attachment, props ) {
- var classes, img, options, size, shortcode, html;
</del><ins>+ image: function( props, attachment ) {
+ var classes = [],
+ img = {},
+ options, sizes, size, shortcode, html;
</ins><span class="cx">
</span><span class="cx"> props = _.defaults( props || {}, {
</span><del>- img: {},
</del><span class="cx"> align: getUserSetting( 'align', 'none' ),
</span><del>- size: getUserSetting( 'imgsize', 'medium' ),
- link: getUserSetting( 'urlbutton', 'post' )
</del><ins>+ size: getUserSetting( 'imgsize', 'medium' )
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- props.linkUrl = linkToUrl( attachment, props );
</del><ins>+ if ( attachment ) {
+ attachment = attachment.toJSON();
</ins><span class="cx">
</span><del>- attachment = attachment.toJSON();
</del><ins>+ classes.push( 'wp-image-' + attachment.id );
</ins><span class="cx">
</span><del>- img = _.clone( props.img );
- classes = img['class'] ? img['class'].split(/\s+/) : [];
- size = attachment.sizes ? attachment.sizes[ props.size ] : {};
</del><ins>+ sizes = attachment.sizes;
+ size = sizes && sizes[ props.size ] ? sizes[ props.size ] : attachment;
</ins><span class="cx">
</span><del>- if ( ! size ) {
- delete props.size;
- size = attachment;
</del><ins>+ _.extend( props, _.pick( attachment, 'align', 'caption' ), {
+ width: size.width,
+ height: size.height,
+ src: size.url,
+ linkUrl: linkToUrl( props, attachment ),
+ captionId: 'attachment_' + attachment.id
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> img.width = size.width;
</span><span class="lines">@@ -153,14 +174,12 @@
</span><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><del>- if ( props.align && ! attachment.caption )
</del><ins>+ if ( props.align && ! props.caption )
</ins><span class="cx"> classes.push( 'align' + props.align );
</span><span class="cx">
</span><span class="cx"> if ( props.size )
</span><span class="cx"> classes.push( 'size-' + props.size );
</span><span class="cx">
</span><del>- classes.push( 'wp-image-' + attachment.id );
-
</del><span class="cx"> img['class'] = _.compact( classes ).join(' ');
</span><span class="cx">
</span><span class="cx"> // Generate `img` tag options.
</span><span class="lines">@@ -170,17 +189,13 @@
</span><span class="cx"> single: true
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // Generate the `href` based on the `link` property.
</del><ins>+ // Generate the `a` element options, if they exist.
</ins><span class="cx"> if ( props.linkUrl ) {
</span><del>- props.anchor = props.anchor || {};
- props.anchor.href = props.linkUrl;
- }
-
- // Generate the `a` element options, if they exist.
- if ( props.anchor ) {
</del><span class="cx"> options = {
</span><del>- tag: 'a',
- attrs: props.anchor,
</del><ins>+ tag: 'a',
+ attrs: {
+ href: props.linkUrl
+ },
</ins><span class="cx"> content: options
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="lines">@@ -188,19 +203,21 @@
</span><span class="cx"> html = wp.html.string( options );
</span><span class="cx">
</span><span class="cx"> // Generate the caption shortcode.
</span><del>- if ( attachment.caption ) {
</del><ins>+ if ( props.caption ) {
</ins><span class="cx"> shortcode = {
</span><del>- id: 'attachment_' + attachment.id,
</del><span class="cx"> width: img.width
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ if ( props.captionId )
+ shortcode.id = props.captionId;
+
</ins><span class="cx"> if ( props.align )
</span><span class="cx"> shortcode.align = 'align' + props.align;
</span><span class="cx">
</span><span class="cx"> html = wp.shortcode.string({
</span><span class="cx"> tag: 'caption',
</span><span class="cx"> attrs: shortcode,
</span><del>- content: html + ' ' + attachment.caption
</del><ins>+ content: html + ' ' + props.caption
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -380,9 +397,9 @@
</span><span class="cx"> delete details[ attachment.cid ];
</span><span class="cx">
</span><span class="cx"> if ( 'image' === attachment.get('type') )
</span><del>- this.insert( wp.media.string.image( attachment, detail ) + ' ' );
</del><ins>+ this.insert( wp.media.string.image( detail, attachment ) + ' ' );
</ins><span class="cx"> else
</span><del>- this.insert( wp.media.string.link( attachment, detail ) + ' ' );
</del><ins>+ this.insert( wp.media.string.link( detail, attachment ) + ' ' );
</ins><span class="cx"> }, this );
</span><span class="cx"> }, this );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>