<!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>[22569] trunk/wp-admin/js/media-upload.js: Media: Declare wp.media.string methods in a single object.</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/22569">22569</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-14 09:31:53 +0000 (Wed, 14 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Declare wp.media.string methods in a single object. 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 (22568 => 22569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-11-14 09:06:10 UTC (rev 22568)
+++ trunk/wp-admin/js/media-upload.js 2012-11-14 09:31:53 UTC (rev 22569)
</span><span class="lines">@@ -108,104 +108,104 @@
</span><span class="cx"> return url || '';
</span><span class="cx"> };
</span><span class="cx">
</span><del>- wp.media.string = {};
</del><ins>+ wp.media.string = {
+ 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
+ }
+ };
</ins><span class="cx">
</span><del>- wp.media.string.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>+ options.attrs.href = linkToUrl( attachment, props );
</ins><span class="cx">
</span><del>- options.attrs.href = linkToUrl( attachment, props );
</del><ins>+ return wp.html.string( options );
+ },
</ins><span class="cx">
</span><del>- return wp.html.string( options );
- };
</del><ins>+ image: function( attachment, props ) {
+ var classes, img, options, size, shortcode, html;
</ins><span class="cx">
</span><del>- wp.media.string.image = function( attachment, props ) {
- var classes, img, options, size, shortcode, html;
</del><ins>+ props = _.defaults( props || {}, {
+ img: {},
+ align: getUserSetting( 'align', 'none' ),
+ size: getUserSetting( 'imgsize', 'medium' ),
+ link: getUserSetting( 'urlbutton', 'post' )
+ });
</ins><span class="cx">
</span><del>- props = _.defaults( props || {}, {
- img: {},
- align: getUserSetting( 'align', 'none' ),
- size: getUserSetting( 'imgsize', 'medium' ),
- link: getUserSetting( 'urlbutton', 'post' )
- });
</del><ins>+ props.linkUrl = linkToUrl( attachment, props );
</ins><span class="cx">
</span><del>- props.linkUrl = linkToUrl( attachment, props );
</del><ins>+ attachment = attachment.toJSON();
</ins><span class="cx">
</span><del>- attachment = attachment.toJSON();
</del><ins>+ img = _.clone( props.img );
+ classes = img['class'] ? img['class'].split(/\s+/) : [];
+ size = attachment.sizes ? attachment.sizes[ props.size ] : {};
</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>+ if ( ! size ) {
+ delete props.size;
+ size = attachment;
+ }
</ins><span class="cx">
</span><del>- if ( ! size ) {
- delete props.size;
- size = attachment;
- }
</del><ins>+ img.width = size.width;
+ img.height = size.height;
+ img.src = size.url;
</ins><span class="cx">
</span><del>- img.width = size.width;
- img.height = size.height;
- img.src = size.url;
</del><ins>+ // Only assign the align class to the image if we're not printing
+ // a caption, since the alignment is sent to the shortcode.
+ if ( props.align && ! attachment.caption )
+ classes.push( 'align' + props.align );
</ins><span class="cx">
</span><del>- // Only assign the align class to the image if we're not printing
- // a caption, since the alignment is sent to the shortcode.
- if ( props.align && ! attachment.caption )
- classes.push( 'align' + props.align );
</del><ins>+ if ( props.size )
+ classes.push( 'size-' + props.size );
</ins><span class="cx">
</span><del>- if ( props.size )
- classes.push( 'size-' + props.size );
</del><ins>+ classes.push( 'wp-image-' + attachment.id );
</ins><span class="cx">
</span><del>- classes.push( 'wp-image-' + attachment.id );
</del><ins>+ img['class'] = _.compact( classes ).join(' ');
</ins><span class="cx">
</span><del>- img['class'] = _.compact( classes ).join(' ');
</del><ins>+ // Generate `img` tag options.
+ options = {
+ tag: 'img',
+ attrs: img,
+ single: true
+ };
</ins><span class="cx">
</span><del>- // Generate `img` tag options.
- options = {
- tag: 'img',
- attrs: img,
- single: true
- };
</del><ins>+ // Generate the `href` based on the `link` property.
+ if ( props.linkUrl ) {
+ props.anchor = props.anchor || {};
+ props.anchor.href = props.linkUrl;
+ }
</ins><span class="cx">
</span><del>- // Generate the `href` based on the `link` property.
- if ( props.linkUrl ) {
- props.anchor = props.anchor || {};
- props.anchor.href = props.linkUrl;
- }
</del><ins>+ // Generate the `a` element options, if they exist.
+ if ( props.anchor ) {
+ options = {
+ tag: 'a',
+ attrs: props.anchor,
+ content: options
+ };
+ }
</ins><span class="cx">
</span><del>- // Generate the `a` element options, if they exist.
- if ( props.anchor ) {
- options = {
- tag: 'a',
- attrs: props.anchor,
- content: options
- };
- }
</del><ins>+ html = wp.html.string( options );
</ins><span class="cx">
</span><del>- html = wp.html.string( options );
</del><ins>+ // Generate the caption shortcode.
+ if ( attachment.caption ) {
+ shortcode = {
+ id: 'attachment_' + attachment.id,
+ width: img.width
+ };
</ins><span class="cx">
</span><del>- // Generate the caption shortcode.
- if ( attachment.caption ) {
- shortcode = {
- id: 'attachment_' + attachment.id,
- width: img.width
- };
</del><ins>+ if ( props.align )
+ shortcode.align = 'align' + props.align;
</ins><span class="cx">
</span><del>- if ( props.align )
- shortcode.align = 'align' + props.align;
</del><ins>+ html = wp.shortcode.string({
+ tag: 'caption',
+ attrs: shortcode,
+ content: html + ' ' + attachment.caption
+ });
+ }
</ins><span class="cx">
</span><del>- html = wp.shortcode.string({
- tag: 'caption',
- attrs: shortcode,
- content: html + ' ' + attachment.caption
- });
</del><ins>+ return html;
</ins><span class="cx"> }
</span><del>-
- return html;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> wp.media.gallery = (function() {
</span></span></pre>
</div>
</div>
</body>
</html>