<!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>[8570] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src: WordCamp Blocks: Add link property to AvatarImage component</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8570">8570</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8570","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-02 22:49:23 +0000 (Tue, 02 Apr 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Blocks: Add link property to AvatarImage component
This adds an optional property that takes a URL. Setting it will
cause the image to be wrapped in an anchor tag. It also adds an
outer div container, regardless of whether a link is set or not.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcorganizersblockcontentjs">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/organizers/block-content.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsharedavatarindexjs">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/avatar/index.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcspeakersblockcontentjs">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/speakers/block-content.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcorganizersblockcontentjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/organizers/block-content.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/organizers/block-content.js 2019-04-02 22:49:16 UTC (rev 8569)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/organizers/block-content.js 2019-04-02 22:49:23 UTC (rev 8570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,18 +42,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> { show_avatars &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div className={ classnames( 'wordcamp-organizer-avatar-container', 'align-' + decodeEntities( avatar_align ) ) }>
- <Disabled>
- <a href={ post.link } className="wordcamp-organizer-avatar-link">
- <AvatarImage
- className="wordcamp-organizer-avatar"
- name={ decodeEntities( post.title.rendered.trim() ) || '' }
- size={ avatar_size }
- url={ post.avatar_urls[ '24' ] }
- />
- </a>
- </Disabled>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <AvatarImage
+ className={ classnames( 'wordcamp-organizer-avatar-container', 'align-' + decodeEntities( avatar_align ) ) }
+ name={ decodeEntities( post.title.rendered.trim() ) || '' }
+ size={ avatar_size }
+ url={ post.avatar_urls[ '24' ] }
+ imageLink={ post.link }
+ />
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> { ( 'none' !== content ) &&
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsharedavatarindexjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/avatar/index.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/avatar/index.js 2019-04-02 22:49:16 UTC (rev 8569)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/avatar/index.js 2019-04-02 22:49:23 UTC (rev 8570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,8 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const { Disabled } = wp.components;
</ins><span class="cx" style="display: block; padding: 0 10px"> const { __, sprintf } = wp.i18n;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const { addQueryArgs } = wp.url;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const { addQueryArgs, isURL } = wp.url;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function AvatarImage( {
</span><span class="cx" style="display: block; padding: 0 10px"> className,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,23 +15,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name,
</span><span class="cx" style="display: block; padding: 0 10px"> size,
</span><span class="cx" style="display: block; padding: 0 10px"> url,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ imageLink,
</ins><span class="cx" style="display: block; padding: 0 10px"> } ) {
</span><span class="cx" style="display: block; padding: 0 10px"> const getSizedURL = ( avatar_url, avatar_size ) => {
</span><span class="cx" style="display: block; padding: 0 10px"> return addQueryArgs( avatar_url, { s: avatar_size } );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const alt = name ? sprintf( __( 'Avatar of %s', 'wordcamporg' ), name ) : '';
-
- return (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ let image = (
</ins><span class="cx" style="display: block; padding: 0 10px"> <img
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- className={ classnames( 'avatar', 'avatar-' + size, 'photo', className ) }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ className={ classnames( 'avatar', 'avatar-' + size, 'photo' ) }
</ins><span class="cx" style="display: block; padding: 0 10px"> src={ getSizedURL( url, size ) }
</span><span class="cx" style="display: block; padding: 0 10px"> srcSet={ getSizedURL( url, size * 2 ) + ' 2x' }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- alt={ alt }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ alt={ name ? sprintf( __( 'Avatar of %s', 'wordcamporg' ), name ) : '' }
</ins><span class="cx" style="display: block; padding: 0 10px"> width={ size }
</span><span class="cx" style="display: block; padding: 0 10px"> height={ size }
</span><span class="cx" style="display: block; padding: 0 10px"> />
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isURL( imageLink ) ) {
+ image = (
+ <Disabled>
+ <a href={ imageLink } className={ classnames( 'wordcamp-image-link', 'wordcamp-avatar-link' ) }>
+ { image }
+ </a>
+ </Disabled>
+ );
+ }
+
+ image = (
+ <div className={ classnames( 'wordcamp-image-container', 'wordcamp-avatar-container', className ) }>
+ { image }
+ </div>
+ );
+
+ return image;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> export default AvatarImage;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcspeakersblockcontentjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/speakers/block-content.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/speakers/block-content.js 2019-04-02 22:49:16 UTC (rev 8569)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/speakers/block-content.js 2019-04-02 22:49:23 UTC (rev 8570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,18 +108,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> { show_avatars &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div className={ classnames( 'wordcamp-speaker-avatar-container', 'align-' + decodeEntities( avatar_align ) ) }>
- <Disabled>
- <a href={ post.link } className="wordcamp-speaker-avatar-link">
- <AvatarImage
- className="wordcamp-speaker-avatar"
- name={ decodeEntities( post.title.rendered.trim() ) || '' }
- size={ avatar_size }
- url={ post.avatar_urls[ '24' ] }
- />
- </a>
- </Disabled>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <AvatarImage
+ className={ classnames( 'wordcamp-speaker-avatar-container', 'align-' + decodeEntities( avatar_align ) ) }
+ name={ decodeEntities( post.title.rendered.trim() ) || '' }
+ size={ avatar_size }
+ url={ post.avatar_urls[ '24' ] }
+ imageLink={ post.link }
+ />
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> { ( 'none' !== content ) &&
</span></span></pre>
</div>
</div>
</body>
</html>