<!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>[22537] trunk: Media: Add custom URL as an option to attachment display properties.</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/22537">22537</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-10 20:36:46 +0000 (Sat, 10 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Add custom URL as an option to attachment display properties. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/22206">#22206</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsmediauploadjs">trunk/wp-admin/js/media-upload.js</a></li>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<li><a href="#trunkwpincludesjsmceviewjs">trunk/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.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 (22536 => 22537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-11-10 19:41:12 UTC (rev 22536)
+++ trunk/wp-admin/js/media-upload.js 2012-11-10 20:36:46 UTC (rev 22537)
</span><span class="lines">@@ -123,10 +123,13 @@
</span><span class="cx"> if ( detail )
</span><span class="cx"> detail = detail.toJSON();
</span><span class="cx">
</span><ins>+ // Reset the attachment details.
+ delete details[ attachment.cid ];
+
</ins><span class="cx"> if ( 'image' === attachment.get('type') )
</span><span class="cx"> return wp.media.string.image( attachment, detail ) + ' ';
</span><span class="cx"> else
</span><del>- return wp.media.string.link( attachment ) + ' ';
</del><ins>+ return wp.media.string.link( attachment, detail ) + ' ';
</ins><span class="cx"> }).join('') );
</span><span class="cx"> }, this );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22536 => 22537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-11-10 19:41:12 UTC (rev 22536)
+++ trunk/wp-includes/css/media-views.css 2012-11-10 20:36:46 UTC (rev 22537)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> min-width: 30%;
</span><span class="cx"> min-height: 24px;
</span><del>- margin-right: 7px;
</del><ins>+ margin-right: 4%;
</ins><span class="cx"> padding-top: 8px;
</span><span class="cx"> line-height: 16px;
</span><span class="cx"> text-align: right;
</span></span></pre></div>
<a id="trunkwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.js (22536 => 22537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.js 2012-11-10 19:41:12 UTC (rev 22536)
+++ trunk/wp-includes/js/mce-view.js 2012-11-10 20:36:46 UTC (rev 22537)
</span><span class="lines">@@ -420,11 +420,26 @@
</span><span class="cx"> // Default TinyMCE Views
</span><span class="cx"> // ---------------------
</span><span class="cx"> (function($){
</span><del>- var mceview = wp.mce.view;
</del><ins>+ var mceview = wp.mce.view,
+ linkToUrl;
</ins><span class="cx">
</span><ins>+ linkToUrl = function( attachment, props ) {
+ var link = props.link,
+ url;
+
+ if ( 'file' === link )
+ url = attachment.get('url');
+ else if ( 'post' === link )
+ url = attachment.get('link');
+ else if ( 'custom' === link )
+ url = props.linkUrl;
+
+ return url || '';
+ };
+
</ins><span class="cx"> wp.media.string = {};
</span><span class="cx">
</span><del>- wp.media.string.link = function( attachment ) {
</del><ins>+ wp.media.string.link = function( attachment, props ) {
</ins><span class="cx"> var linkTo = getUserSetting( 'urlbutton', 'post' ),
</span><span class="cx"> options = {
</span><span class="cx"> tag: 'a',
</span><span class="lines">@@ -434,9 +449,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // 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');
</del><ins>+ options.attrs.href = linkToUrl( attachment, props );
</ins><span class="cx">
</span><span class="cx"> return wp.html.string( options );
</span><span class="cx"> };
</span><span class="lines">@@ -444,8 +457,6 @@
</span><span class="cx"> wp.media.string.image = function( attachment, props ) {
</span><span class="cx"> var classes, img, options, size;
</span><span class="cx">
</span><del>- attachment = attachment.toJSON();
-
</del><span class="cx"> props = _.defaults( props || {}, {
</span><span class="cx"> img: {},
</span><span class="cx"> align: getUserSetting( 'align', 'none' ),
</span><span class="lines">@@ -453,6 +464,10 @@
</span><span class="cx"> link: getUserSetting( 'urlbutton', 'post' )
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ props.linkUrl = linkToUrl( attachment, props );
+
+ attachment = attachment.toJSON();
+
</ins><span class="cx"> img = _.clone( props.img );
</span><span class="cx"> classes = img['class'] ? img['class'].split(/\s+/) : [];
</span><span class="cx"> size = attachment.sizes ? attachment.sizes[ props.size ] : {};
</span><span class="lines">@@ -485,13 +500,9 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Generate the `href` based on the `link` property.
</span><del>- if ( props.link && 'none' !== props.link ) {
</del><ins>+ if ( props.linkUrl ) {
</ins><span class="cx"> props.anchor = props.anchor || {};
</span><del>-
- if ( 'post' === props.link )
- props.anchor.href = attachment.link;
- else if ( 'file' === props.link )
- props.anchor.href = attachment.url;
</del><ins>+ props.anchor.href = props.linkUrl;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Generate the `a` element options, if they exist.
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22536 => 22537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-10 19:41:12 UTC (rev 22536)
+++ trunk/wp-includes/js/media-views.js 2012-11-10 20:36:46 UTC (rev 22537)
</span><span class="lines">@@ -2513,6 +2513,10 @@
</span><span class="cx"> this.model.on( 'change', this.updateChanges, this );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ destroy: function() {
+ this.model.off( null, null, this );
+ },
+
</ins><span class="cx"> render: function() {
</span><span class="cx"> this.$el.html( this.template( _.defaults({
</span><span class="cx"> model: this.model.toJSON()
</span><span class="lines">@@ -2582,6 +2586,31 @@
</span><span class="cx"> userSettings: false
</span><span class="cx"> });
</span><span class="cx"> media.view.Settings.prototype.initialize.apply( this, arguments );
</span><ins>+ this.model.on( 'change:link', this.updateCustomLink, this );
+ },
+
+ render: function() {
+ media.view.Settings.prototype.render.call( this );
+ this.updateCustomLink();
+ return this;
+ },
+
+ updateCustomLink: function() {
+ var isCustom = 'custom' === this.model.get('link'),
+ $input = this.$('.link-to-custom');
+
+ if ( ! isCustom ) {
+ $input.hide();
+ return;
+ }
+
+ $input.show();
+ if ( ! this.model.get('linkUrl') )
+ $input.val('http://');
+
+ // If the input is visible, focus and select its contents.
+ if ( $input.is(':visible') )
+ $input.focus()[0].select();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22536 => 22537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-10 19:41:12 UTC (rev 22536)
+++ trunk/wp-includes/media.php 2012-11-10 20:36:46 UTC (rev 22537)
</span><span class="lines">@@ -1536,25 +1536,31 @@
</span><span class="cx"> </select>
</span><span class="cx"> </label>
</span><span class="cx">
</span><del>- <label class="setting">
- <span><?php _e('Link To'); ?></span>
- <select class="link-to"
- data-setting="link"
- <# if ( userSettings ) { #>
- data-user-setting="urlbutton"
- <# } #>>
</del><ins>+ <div class="setting">
+ <label>
+ <span><?php _e('Link To'); ?></span>
+ <select class="link-to"
+ data-setting="link"
+ <# if ( userSettings ) { #>
+ data-user-setting="urlbutton"
+ <# } #>>
</ins><span class="cx">
</span><del>- <option value="post" selected>
- <?php esc_attr_e('Attachment Page'); ?>
- </option>
- <option value="file">
- <?php esc_attr_e('Media File'); ?>
- </option>
- <option value="none">
- <?php esc_attr_e('None'); ?>
- </option>
- </select>
- </label>
</del><ins>+ <option value="custom">
+ <?php esc_attr_e('Custom URL'); ?>
+ </option>
+ <option value="post" selected>
+ <?php esc_attr_e('Attachment Page'); ?>
+ </option>
+ <option value="file">
+ <?php esc_attr_e('Media File'); ?>
+ </option>
+ <option value="none">
+ <?php esc_attr_e('None'); ?>
+ </option>
+ </select>
+ </label>
+ <input type="text" class="link-to-custom" data-setting="linkUrl" />
+ </div>
</ins><span class="cx">
</span><span class="cx"> <# if ( ! _.isUndefined( sizes ) ) { #>
</span><span class="cx"> <label class="setting">
</span></span></pre>
</div>
</div>
</body>
</html>