<!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>[22170] trunk: Correctly insert non-image attachments as links.</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/22170">22170</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-10 21:54:21 +0000 (Wed, 10 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correctly insert non-image attachments as links.
* Adds `wp.media.string.link( attachment )` for printing attachment links.
* Adds the `link` attribute to `Attachment` models that corresponds to the link to the attachment post.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21836">#21836</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>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</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 (22169 => 22170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-10-10 21:38:10 UTC (rev 22169)
+++ trunk/wp-admin/js/media-upload.js 2012-10-10 21:54:21 UTC (rev 22170)
</span><span class="lines">@@ -108,9 +108,12 @@
</span><span class="cx"> } ) );
</span><span class="cx">
</span><span class="cx"> workflow.on( 'update:insert', function( selection ) {
</span><del>- this.insert( '\n' + selection.map( function( attachment ) {
- return wp.media.string.image( attachment );
- }).join('\n\n') + '\n' );
</del><ins>+ this.insert( selection.map( function( attachment ) {
+ if ( 'image' === attachment.get('type') )
+ return '\n' + wp.media.string.image( attachment ) + '\n';
+ else
+ return wp.media.string.link( attachment ) + ' ';
+ }).join('') );
</ins><span class="cx"> }, this );
</span><span class="cx">
</span><span class="cx"> workflow.on( 'update:gallery', function( selection ) {
</span></span></pre></div>
<a id="trunkwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.js (22169 => 22170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.js 2012-10-10 21:38:10 UTC (rev 22169)
+++ trunk/wp-includes/js/mce-view.js 2012-10-10 21:54:21 UTC (rev 22170)
</span><span class="lines">@@ -371,6 +371,24 @@
</span><span class="cx"> var mceview = wp.mce.view;
</span><span class="cx">
</span><span class="cx"> wp.media.string = {};
</span><ins>+
+ wp.media.string.link = function( attachment ) {
+ var linkTo = getUserSetting( 'urlbutton', 'post' ),
+ options = {
+ tag: 'a',
+ content: attachment.get('title') || attachment.get('filename'),
+ attrs: {
+ rel: 'attachment wp-att-' + attachment.id
+ }
+ };
+
+ // Attachments can be linked to attachment post pages or to the direct
+ // URL. `none` is not a valid option.
+ options.attrs.href = ( linkTo === 'file' ) ? attachment.get('url') : attachment.get('link');
+
+ return wp.html.string( options );
+ };
+
</ins><span class="cx"> wp.media.string.image = function( attachment, props ) {
</span><span class="cx"> var classes, img, options, size;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22169 => 22170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-10-10 21:38:10 UTC (rev 22169)
+++ trunk/wp-includes/media.php 2012-10-10 21:54:21 UTC (rev 22170)
</span><span class="lines">@@ -1246,6 +1246,7 @@
</span><span class="cx"> 'title' => $attachment->post_title,
</span><span class="cx"> 'filename' => basename( $attachment->guid ),
</span><span class="cx"> 'url' => $attachment_url,
</span><ins>+ 'link' => get_attachment_link( $attachment->ID ),
</ins><span class="cx"> 'alt' => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
</span><span class="cx"> 'author' => $attachment->post_author,
</span><span class="cx"> 'description' => $attachment->post_content,
</span></span></pre>
</div>
</div>
</body>
</html>