<!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>[41252] trunk/src: Widgets: Expose link URL input field in Image widget to avoid having to open media modal to discover.</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 { 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="https://core.trac.wordpress.org/changeset/41252">41252</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41252","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-08-14 17:55:24 +0000 (Mon, 14 Aug 2017)</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'>Widgets: Expose link URL input field in Image widget to avoid having to open media modal to discover.
Props timmydcrawford, westonruter.
See <a href="https://core.trac.wordpress.org/ticket/39993">#39993</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/41274">#41274</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswidgetscss">trunk/src/wp-admin/css/widgets.css</a></li>
<li><a href="#trunksrcwpadminjswidgetsmediaimagewidgetjs">trunk/src/wp-admin/js/widgets/media-image-widget.js</a></li>
<li><a href="#trunksrcwpadminjswidgetsmediawidgetsjs">trunk/src/wp-admin/js/widgets/media-widgets.js</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp">trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaphp">trunk/src/wp-includes/widgets/class-wp-widget-media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswidgetscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/widgets.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/widgets.css 2017-08-14 05:58:23 UTC (rev 41251)
+++ trunk/src/wp-admin/css/widgets.css 2017-08-14 17:55:24 UTC (rev 41252)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,6 +152,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #f00;
</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">+.media-widget-image-link {
+ margin: 1em 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Widget Dragging Helpers */
</span><span class="cx" style="display: block; padding: 0 10px"> .widget.ui-draggable-dragging {
</span><span class="cx" style="display: block; padding: 0 10px"> min-width: 100%;
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsmediaimagewidgetjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/widgets/media-image-widget.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/widgets/media-image-widget.js 2017-08-14 05:58:23 UTC (rev 41251)
+++ trunk/src/wp-admin/js/widgets/media-image-widget.js 2017-08-14 17:55:24 UTC (rev 41252)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,14 +30,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> renderPreview: function renderPreview() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var control = this, previewContainer, previewTemplate;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var control = this, previewContainer, previewTemplate, fieldsContainer, fieldsTemplate, linkInput;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! control.model.get( 'attachment_id' ) && ! control.model.get( 'url' ) ) {
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> previewContainer = control.$el.find( '.media-widget-preview' );
</span><span class="cx" style="display: block; padding: 0 10px"> previewTemplate = wp.template( 'wp-media-widget-image-preview' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- previewContainer.html( previewTemplate( _.extend( control.previewTemplateProps.toJSON() ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ previewContainer.html( previewTemplate( control.previewTemplateProps.toJSON() ) );
+
+ linkInput = control.$el.find( '.link' );
+ if ( ! linkInput.is( document.activeElement ) ) {
+ fieldsContainer = control.$el.find( '.media-widget-fields' );
+ fieldsTemplate = wp.template( 'wp-media-widget-image-fields' );
+ fieldsContainer.html( fieldsTemplate( control.previewTemplateProps.toJSON() ) );
+ }
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,11 +71,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mediaFrame.$el.addClass( 'media-widget' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> updateCallback = function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var mediaProps;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var mediaProps, linkType;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update cached attachment object to avoid having to re-fetch. This also triggers re-rendering of preview.
</span><span class="cx" style="display: block; padding: 0 10px"> mediaProps = mediaFrame.state().attributes.image.toJSON();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ linkType = mediaProps.link;
+ mediaProps.link = mediaProps.linkUrl;
</ins><span class="cx" style="display: block; padding: 0 10px"> control.selectedAttachment.set( mediaProps );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ control.displaySettings.set( 'link', linkType );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> control.model.set( _.extend(
</span><span class="cx" style="display: block; padding: 0 10px"> control.mapMediaToModelProps( mediaProps ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,11 +140,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {Object} Preview template props.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> mapModelToPreviewTemplateProps: function mapModelToPreviewTemplateProps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var control = this, mediaFrameProps, url;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var control = this, previewTemplateProps, url;
</ins><span class="cx" style="display: block; padding: 0 10px"> url = control.model.get( 'url' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mediaFrameProps = component.MediaWidgetControl.prototype.mapModelToPreviewTemplateProps.call( control );
- mediaFrameProps.currentFilename = url ? url.replace( /\?.*$/, '' ).replace( /^.+\//, '' ) : '';
- return mediaFrameProps;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ previewTemplateProps = component.MediaWidgetControl.prototype.mapModelToPreviewTemplateProps.call( control );
+ previewTemplateProps.currentFilename = url ? url.replace( /\?.*$/, '' ).replace( /^.+\//, '' ) : '';
+ previewTemplateProps.link_url = control.model.get( 'link_url' );
+ return previewTemplateProps;
</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="trunksrcwpadminjswidgetsmediawidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/widgets/media-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/widgets/media-widgets.js 2017-08-14 05:58:23 UTC (rev 41251)
+++ trunk/src/wp-admin/js/widgets/media-widgets.js 2017-08-14 17:55:24 UTC (rev 41252)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,6 +512,26 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update link_url attribute.
+ control.$el.on( 'input change', '.link', function updateLinkUrl() {
+ var linkUrl = $.trim( $( this ).val() ), linkType = 'custom';
+ if ( control.selectedAttachment.get( 'linkUrl' ) === linkUrl || control.selectedAttachment.get( 'link' ) === linkUrl ) {
+ linkType = 'post';
+ } else if ( control.selectedAttachment.get( 'url' ) === linkUrl ) {
+ linkType = 'file';
+ }
+ control.model.set( {
+ link_url: linkUrl,
+ link_type: linkType
+ });
+
+ // Update display settings for the next time the user opens to select from the media library.
+ control.displaySettings.set( {
+ link: linkType,
+ linkUrl: linkUrl
+ });
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Copy current display settings from the widget model to serve as basis
</span><span class="cx" style="display: block; padding: 0 10px"> * of customized display settings for the current media frame session.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -822,7 +842,7 @@
</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"> if ( 'post' === mediaFrameProps.link ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- modelProps.link_url = mediaFrameProps.postUrl;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ modelProps.link_url = mediaFrameProps.postUrl || mediaFrameProps.linkUrl;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( 'file' === mediaFrameProps.link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> modelProps.link_url = mediaFrameProps.url;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2017-08-14 05:58:23 UTC (rev 41251)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2017-08-14 17:55:24 UTC (rev 41252)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'none',
</span><span class="cx" style="display: block; padding: 0 10px"> 'media_prop' => 'link',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Link To' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'should_preview_update' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'should_preview_update' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_url' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'uri',
</span><span class="cx" style="display: block; padding: 0 10px"> 'media_prop' => 'linkUrl',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'URL' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'should_preview_update' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'should_preview_update' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'image_classes' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,10 +307,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::render_control_template_scripts();
</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">+ <script type="text/html" id="tmpl-wp-media-widget-image-fields">
+ <# var elementIdPrefix = 'el' + String( Math.random() ) + '_'; #>
+ <# if ( data.url ) { #>
+ <p class="media-widget-image-link">
+ <label for="{{ elementIdPrefix }}linkUrl"><?php esc_html_e( 'Link to:' ); ?></label>
+ <input id="{{ elementIdPrefix }}linkUrl" type="url" class="widefat link" value="{{ data.link_url }}" placeholder="http://">
+ </p>
+ <# } #>
+ </script>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-image-preview">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <#
- var describedById = 'describedBy-' + String( Math.random() );
- #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# var describedById = 'describedBy-' + String( Math.random() ); #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt notice-missing-attachment">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $this->l10n['missing_attachment']; ?></p>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media.php 2017-08-14 05:58:23 UTC (rev 41251)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media.php 2017-08-14 17:55:24 UTC (rev 41252)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,6 +404,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $this->l10n['add_media'] ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="media-widget-fields">
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>