<!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>[8572] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src: WordCamp Blocks: Add link property to FeaturedImage 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/8572">8572</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/8572","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 23:03:51 +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 FeaturedImage 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_htmlwpcontentmupluginsblocksassetssrcsessionsblockcontentjs">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/sessions/block-content.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsharedfeaturedimageindexjs">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/featured-image/index.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsponsorsblockcontentjs">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/sponsors/block-content.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsessionsblockcontentjs"></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/sessions/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/sessions/block-content.js 2019-04-02 22:52:16 UTC (rev 8571)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/sessions/block-content.js 2019-04-02 23:03:51 UTC (rev 8572)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,8 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> render() {
</span><span class="cx" style="display: block; padding: 0 10px"> const { attributes, sessionPosts } = this.props;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const { show_speaker, show_images, image_align, featured_image_height, featured_image_width, content, excerpt_more, show_meta, show_category } = attributes;
- const featuredImageSize = { height: featured_image_height, width: featured_image_width };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const { show_speaker, show_images, image_align, featured_image_width, content, excerpt_more, show_meta, show_category } = attributes;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return (
</span><span class="cx" style="display: block; padding: 0 10px"> <GridContentLayout { ...this.props } >
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,11 +162,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> { show_images &&
</span><span class="cx" style="display: block; padding: 0 10px"> <FeaturedImage
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- className={ 'wordcamp-session-image-container align-' + decodeEntities( image_align ) }
- size={ featuredImageSize }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ className={ classnames( 'wordcamp-session-image-container', 'align-' + decodeEntities( image_align ) ) }
</ins><span class="cx" style="display: block; padding: 0 10px"> wpMediaDetails={ get( post, '_embedded.wp:featuredmedia[0].media_details.sizes', {} ) }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- alt={ post.title.rendered }
- { ...this.props }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ alt={ decodeEntities( post.title.rendered ) }
+ width={ Number( featured_image_width ) }
+ 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">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsharedfeaturedimageindexjs"></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/featured-image/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/featured-image/index.js 2019-04-02 22:52:16 UTC (rev 8571)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/featured-image/index.js 2019-04-02 23:03:51 UTC (rev 8572)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +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 { Component } = wp.element;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const { isURL } = wp.url;
</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"> * Displays featured image, can be linked with block control for size.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,20 +67,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {*}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> render() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const { className, alt, attributes } = this.props;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const { className, alt, width = 150, imageLink } = this.props;
+ const fullImage = this.getFullImage();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const { featured_image_width } = attributes;
- const image = this.getFullImage();
-
- const width = featured_image_width || 150;
-
- 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><span class="cx" style="display: block; padding: 0 10px"> className={ classnames( 'wordcamp-featured-image', className ) }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src={ image.source_url }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src={ fullImage.source_url }
</ins><span class="cx" style="display: block; padding: 0 10px"> alt={ alt }
</span><span class="cx" style="display: block; padding: 0 10px"> width={ width + 'px' }
</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-featured-image-link' ) }>
+ { image }
+ </a>
+ </Disabled>
+ );
+ }
+
+ image = (
+ <div className={ classnames( 'wordcamp-image-container', 'wordcamp-featured-image-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></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsponsorsblockcontentjs"></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/sponsors/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/sponsors/block-content.js 2019-04-02 22:52:16 UTC (rev 8571)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/sponsors/block-content.js 2019-04-02 23:03:51 UTC (rev 8572)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function SponsorDetail( { sponsorPost, attributes, onFeatureImageChange } ) {
</span><span class="cx" style="display: block; padding: 0 10px"> const {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- show_name, show_logo, show_desc, content, excerpt_more,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ show_name, show_logo, show_desc, content, excerpt_more, featured_image_width
</ins><span class="cx" style="display: block; padding: 0 10px"> } = attributes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const featuredImageSizes = get( sponsorPost, '_embedded.wp:featuredmedia[0].media_details.sizes', {} );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,28 +41,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div className={ 'wordcamp-sponsor-details wordcamp-sponsor-details-' + escapeAttribute( sponsorPost.slug ) }>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> { ( show_name || show_name === undefined ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ItemTitle
- className="wordcamp-sponsor-title"
- headingLevel={ 3 }
- title={ sponsorPost.title.rendered.trim() }
- link={ sponsorPost.link }
- />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ItemTitle
+ className="wordcamp-sponsor-title"
+ headingLevel={ 3 }
+ title={ sponsorPost.title.rendered.trim() }
+ link={ sponsorPost.link }
+ />
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> { ( show_logo || show_logo === undefined ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <FeaturedImage
- className={ 'wordcamp-sponsor-featured-image wordcamp-sponsor-logo' }
- wpMediaDetails={ featuredImageSizes }
- alt={ sponsorPost.title.rendered }
- attributes={ attributes }
- />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <FeaturedImage
+ className={ 'wordcamp-sponsor-featured-image wordcamp-sponsor-logo' }
+ wpMediaDetails={ featuredImageSizes }
+ alt={ sponsorPost.title.rendered }
+ width={ featured_image_width }
+ imageLink={ sponsorPost.link }
+ />
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> { ( 'none' !== content ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ItemHTMLContent
- className={ classnames( 'wordcamp-sponsor-content' ) }
- content={ displayContent }
- link={ ( 'full' === content || excerpt_more ) ? sponsorPost.link : null }
- linkText={ 'full' === content ? __( 'Visit sponsor page', 'wordcamporg' ) : __( 'Read more', 'wordcamporg' ) }
- />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ItemHTMLContent
+ className={ classnames( 'wordcamp-sponsor-content' ) }
+ content={ displayContent }
+ link={ ( 'full' === content || excerpt_more ) ? sponsorPost.link : null }
+ linkText={ 'full' === content ? __( 'Visit sponsor page', 'wordcamporg' ) : __( 'Read more', 'wordcamporg' ) }
+ />
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>