<!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>[31642] trunk/src/wp-includes: Media: UI tweaks for Insert from URL.</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/31642">31642</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/31642","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-06 15:02:08 +0000 (Fri, 06 Mar 2015)</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'>Media: UI tweaks for Insert from URL.
"Title" field is now labeled as "Link Text", to reflect how it's actually used. It's also hidden whenever the embed is updating, to make it clearer that something is happening. Embed dimension fields are shown below the preview, much like image property fields are shown below.
fixes <a href="https://core.trac.wordpress.org/ticket/29476">#29476</a>, see <a href="https://core.trac.wordpress.org/ticket/31139">#31139</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsembedlinkjs">trunk/src/wp-includes/js/media/views/embed/link.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media/views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsembedlinkjs"></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/js/media/views/embed/link.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/embed/link.js 2015-03-06 14:05:05 UTC (rev 31641)
+++ trunk/src/wp-includes/js/media/views/embed/link.js 2015-03-06 15:02:08 UTC (rev 31642)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // clear out previous results
</span><span class="cx" style="display: block; padding: 0 10px"> this.$('.embed-container').hide().find('.embed-preview').html('');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.setting' ).hide();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // only proceed with embed if the field contains more than 6 characters
</span><span class="cx" style="display: block; padding: 0 10px"> if ( url && url.length < 6 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +65,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"> renderFail: function () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.setting' ).hide().filter( '.title' ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.setting' ).hide().filter( '.link-text' ).show();
</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"> renderoEmbed: function( response ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> opts = { silent: true };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$( '.setting' ).hide()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .filter( '.title' )[ html ? 'hide' : 'show' ]();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .filter( '.link-text' )[ html ? 'hide' : 'show' ]();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( response && response.attr ) {
</span><span class="cx" style="display: block; padding: 0 10px"> attr = response.attr;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></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/js/media/views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views.js 2015-03-06 14:05:05 UTC (rev 31641)
+++ trunk/src/wp-includes/js/media/views.js 2015-03-06 15:02:08 UTC (rev 31642)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4605,6 +4605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // clear out previous results
</span><span class="cx" style="display: block; padding: 0 10px"> this.$('.embed-container').hide().find('.embed-preview').html('');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.setting' ).hide();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // only proceed with embed if the field contains more than 6 characters
</span><span class="cx" style="display: block; padding: 0 10px"> if ( url && url.length < 6 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4641,7 +4642,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"> renderFail: function () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.setting' ).hide().filter( '.title' ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.setting' ).hide().filter( '.link-text' ).show();
</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"> renderoEmbed: function( response ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4650,7 +4651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> opts = { silent: true };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$( '.setting' ).hide()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .filter( '.title' )[ html ? 'hide' : 'show' ]();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .filter( '.link-text' )[ html ? 'hide' : 'show' ]();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( response && response.attr ) {
</span><span class="cx" style="display: block; padding: 0 10px"> attr = response.attr;
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></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/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2015-03-06 14:05:05 UTC (rev 31641)
+++ trunk/src/wp-includes/media-template.php 2015-03-06 15:02:08 UTC (rev 31642)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,10 +815,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-embed-link-settings">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="setting title">
- <span><?php _e( 'Title' ); ?></span>
- <input type="text" class="alignment" data-setting="title" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label class="setting link-text">
+ <span><?php _e( 'Link Text' ); ?></span>
+ <input type="text" class="alignment" data-setting="link-text" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="embed-container" style="display: none;">
+ <div class="embed-preview"></div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="embed-link-dimensions">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting width">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Maximum Width' ); ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -829,9 +832,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" class="alignment" data-setting="height" />
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</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">- <div class="embed-container" style="display: none;">
- <div class="embed-preview"></div>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-embed-image-settings">
</span></span></pre>
</div>
</div>
</body>
</html>