<!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>[41759] trunk: Widgets: Allow oEmbeds in video widget.</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/41759">41759</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/41759","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-05 00:21:27 +0000 (Thu, 05 Oct 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: Allow oEmbeds in video widget.
Opens up video embeds to all supported video oEmbed providers.
Props westonruter.
See <a href="https://core.trac.wordpress.org/ticket/42039">#42039</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjswidgetsmediavideowidgetjs">trunk/src/wp-admin/js/widgets/media-video-widget.js</a></li>
<li><a href="#trunksrcwpadminjswidgetsmediawidgetsjs">trunk/src/wp-admin/js/widgets/media-widgets.js</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediavideophp">trunk/src/wp-includes/widgets/class-wp-widget-media-video.php</a></li>
<li><a href="#trunktestsqunitwpadminjswidgetstestmediavideowidgetjs">trunk/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjswidgetsmediavideowidgetjs"></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-video-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-video-widget.js 2017-10-05 00:18:44 UTC (rev 41758)
+++ trunk/src/wp-admin/js/widgets/media-video-widget.js 2017-10-05 00:21:27 UTC (rev 41759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,13 +136,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether a url is a supported external host.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since 4.9.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param {String} url - Video url.
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {boolean} Whether url is a supported video host.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> isHostedVideo: function isHostedVideo( url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var parsedUrl = document.createElement( 'a' );
- parsedUrl.href = url;
- return /vimeo|youtu\.?be/.test( parsedUrl.host );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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">@@ -151,7 +151,7 @@
</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, attachmentId, attachmentUrl, poster, isHostedEmbed = false, mime, error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var control = this, previewContainer, previewTemplate, attachmentId, attachmentUrl, poster, html = '', isOEmbed = false, mime, error, urlParser, matches;
</ins><span class="cx" style="display: block; padding: 0 10px"> attachmentId = control.model.get( 'attachment_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> attachmentUrl = control.model.get( 'url' );
</span><span class="cx" style="display: block; padding: 0 10px"> error = control.model.get( 'error' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,33 +160,44 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! attachmentId && attachmentUrl ) {
- isHostedEmbed = control.isHostedVideo( attachmentUrl );
- }
-
- if ( isHostedEmbed ) {
- control.fetchEmbed();
- poster = control.oembedResponses[ attachmentUrl ] ? control.oembedResponses[ attachmentUrl ].thumbnail_url : null;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Verify the selected attachment mime is supported.
</span><span class="cx" style="display: block; padding: 0 10px"> mime = control.selectedAttachment.get( 'mime' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mime && attachmentId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! _.contains( _.values( wp.media.view.settings.embedMimes ), mime ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> error = 'unsupported_file_type';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( ! attachmentId ) {
+ urlParser = document.createElement( 'a' );
+ urlParser.href = attachmentUrl;
+ matches = urlParser.pathname.toLowerCase().match( /\.(\w+)$/ );
+ if ( matches ) {
+ if ( ! _.contains( _.keys( wp.media.view.settings.embedMimes ), matches[1] ) ) {
+ error = 'unsupported_file_type';
+ }
+ } else {
+ isOEmbed = true;
+ }
</ins><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 ( isOEmbed ) {
+ control.fetchEmbed();
+ if ( control.oembedResponses[ attachmentUrl ] ) {
+ poster = control.oembedResponses[ attachmentUrl ].thumbnail_url;
+ html = control.oembedResponses[ attachmentUrl ].html.replace( /\swidth="\d+"/, ' width="100%"' ).replace( /\sheight="\d+"/, '' );
+ }
+ }
+
</ins><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-video-preview' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> previewContainer.html( previewTemplate({
</span><span class="cx" style="display: block; padding: 0 10px"> model: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attachment_id: control.model.get( 'attachment_id' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attachment_id: attachmentId,
+ html: html,
</ins><span class="cx" style="display: block; padding: 0 10px"> src: attachmentUrl,
</span><span class="cx" style="display: block; padding: 0 10px"> poster: poster
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- is_hosted_embed: isHostedEmbed,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ is_oembed: isOEmbed,
</ins><span class="cx" style="display: block; padding: 0 10px"> error: error
</span><span class="cx" style="display: block; padding: 0 10px"> }));
</span><span class="cx" style="display: block; padding: 0 10px"> wp.mediaelement.initialize();
</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-10-05 00:18:44 UTC (rev 41758)
+++ trunk/src/wp-admin/js/widgets/media-widgets.js 2017-10-05 00:21:27 UTC (rev 41759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,12 +184,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If video, test for Vimeo and YouTube, otherwise, renderFail(). This should be removed once #34115 is resolved.
- if ( 'video' === this.controller.options.mimeType && ! /vimeo|youtu\.?be/.test( urlParser.host ) ) {
- embedLinkView.renderFail();
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Support YouTube embed links.
</span><span class="cx" style="display: block; padding: 0 10px"> url = embedLinkView.model.get( 'url' );
</span><span class="cx" style="display: block; padding: 0 10px"> re = /https?:\/\/www\.youtube\.com\/embed\/([^/]+)/;
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediavideophp"></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-video.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-video.php 2017-10-05 00:18:44 UTC (rev 41758)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-video.php 2017-10-05 00:21:27 UTC (rev 41759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,17 +121,21 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wp_video_shortcode', array( $this, 'inject_video_max_width_style' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $attachment ) {
+ add_filter( 'wp_video_shortcode', array( $this, 'inject_video_max_width_style' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo wp_video_shortcode(
- array_merge(
- $instance,
- compact( 'src' )
- ),
- $instance['content']
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo wp_video_shortcode(
+ array_merge(
+ $instance,
+ compact( 'src' )
+ ),
+ $instance['content']
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wp_video_shortcode', array( $this, 'inject_video_max_width_style' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_video_shortcode', array( $this, 'inject_video_max_width_style' ) );
+ } else {
+ echo $this->inject_video_max_width_style( wp_oembed_get( $src ) );
+ }
</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">@@ -227,11 +231,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# } else if ( data.is_hosted_embed && data.model.poster ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# } else if ( data.is_oembed && data.model.poster ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="{{ data.model.src }}" target="_blank" class="media-widget-video-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="{{ data.model.poster }}" />
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# } else if ( data.is_hosted_embed ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# } else if ( data.is_oembed ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="{{ data.model.src }}" target="_blank" class="media-widget-video-link no-poster">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="dashicons dashicons-format-video"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span></span></pre></div>
<a id="trunktestsqunitwpadminjswidgetstestmediavideowidgetjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js 2017-10-05 00:18:44 UTC (rev 41758)
+++ trunk/tests/qunit/wp-admin/js/widgets/test-media-video-widget.js 2017-10-05 00:21:27 UTC (rev 41759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,12 +34,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> equal( mappedProps.title, undefined, 'mapMediaToModelProps should ignore title inputs' );
</span><span class="cx" style="display: block; padding: 0 10px"> equal( mappedProps.loop, false, 'mapMediaToModelProps should set loop' );
</span><span class="cx" style="display: block; padding: 0 10px"> equal( mappedProps.preload, 'meta', 'mapMediaToModelProps should set preload' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Test isHostedVideo().
- equal( videoWidgetControlInstance.isHostedVideo( 'https://www.youtube.com/watch?v=OQSNhk5ICTI' ), true, 'isHostedVideo should return true for full YouTube url.' );
- equal( videoWidgetControlInstance.isHostedVideo( 'https://youtu.be/OQSNhk5ICTI' ), true, 'isHostedVideo should return true for shortened youtube url' );
- equal( videoWidgetControlInstance.isHostedVideo( 'https://vimeo.com/190372437' ), true, 'isHostedVideo should return true for vimeo url.' );
- equal( videoWidgetControlInstance.isHostedVideo( 'https://wordpress.org/' ), false, 'isHostedVideo should return false for non-supported video url.' );
</del><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"> test( 'video widget control renderPreview', function( assert ) {
</span></span></pre>
</div>
</div>
</body>
</html>