<!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>[36483] trunk/src/wp-includes: TinyMCE inline link:</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/36483">36483</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/36483","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-06 00:50:31 +0000 (Sat, 06 Feb 2016)</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'>TinyMCE inline link:
- Fix not displaying anything when the URL is only a fragment. Show the whole URL.
- Fix editing a link when it is the very first word in the editor.
- Fix editing a link then some of the surrounding text or space is selected. Change the selection to only the link node.
- Add placeholder when adding new link.
See <a href="https://core.trac.wordpress.org/ticket/33301">#33301</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswplinkpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></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/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2016-02-05 19:02:51 UTC (rev 36482)
+++ trunk/src/wp-includes/class-wp-editor.php 2016-02-06 00:50:31 UTC (rev 36483)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,6 +1043,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
</span><span class="cx" style="display: block; padding: 0 10px"> 'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
</span><span class="cx" style="display: block; padding: 0 10px"> 'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Paste URL or type to search' => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Shortcuts help modal
</span><span class="cx" style="display: block; padding: 0 10px"> 'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswplinkpluginjs"></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/tinymce/plugins/wplink/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js 2016-02-05 19:02:51 UTC (rev 36482)
+++ trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js 2016-02-06 00:50:31 UTC (rev 36483)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> url = url.slice( 0, -1 );
</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 nothing's left (maybe the URL was just a fragment), use the whole URL.
+ if ( url === '' ) {
+ url = this.url;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the URL is longer that 40 chars, concatenate the beginning (after the domain) and ending with ...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( url.length > 40 && ( index = url.indexOf( '/' ) ) !== -1 && ( lastIndex = url.lastIndexOf( '/' ) ) !== -1 && lastIndex !== index ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the beginning + ending are shorter that 40 chars, show more of the ending
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> renderHtml: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> return (
</span><span class="cx" style="display: block; padding: 0 10px"> '<div id="' + this._id + '" class="wp-link-input">' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<input type="text" value="" tabindex="-1" />' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<input type="text" value="" tabindex="-1" placeholder="' + tinymce.translate('Paste URL or type to search') + '" />' +
</ins><span class="cx" style="display: block; padding: 0 10px"> '</div>'
</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">@@ -68,6 +73,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var inputInstance;
</span><span class="cx" style="display: block; padding: 0 10px"> var $ = window.jQuery;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function getSelectedLink() {
+ var href,
+ selectedNode = editor.selection.getNode(),
+ selectedText = editor.selection.getContent(),
+ link = editor.dom.getParent( selectedNode, 'a[href]' );
+
+ if ( ! link && selectedText.indexOf( '</a>' ) !== -1 ) {
+ href = selectedText.match( /href="([^">]+)"/ );
+
+ if ( href && href[1] ) {
+ link = editor.$( 'a[href="' + href[1] + '"]', selectedNode )[0];
+ }
+
+ if ( link ) {
+ editor.selection.select( link );
+ editor.nodeChanged();
+ }
+ }
+
+ return link;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'preinit', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( editor.wp && editor.wp._createToolbar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar = editor.wp._createToolbar( [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,9 +110,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ], true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editToolbar.on( 'show', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var node = editToolbar.find( 'toolbar' )[0];
- node && node.focus( true );
- a = editor.dom.getParent( editor.selection.getNode(), 'a' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var inputNode = editToolbar.find( 'toolbar' )[0];
+
+ inputNode && inputNode.focus( true );
+ a = getSelectedLink();
</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"> editToolbar.on( 'hide', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,15 +123,14 @@
</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"> editor.addCommand( 'WP_Link', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var a = editor.dom.getParent( editor.selection.getNode(), 'a' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var link = getSelectedLink();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( a ) {
- editor.dom.setAttribs( a, { 'data-wp-edit': true } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( link ) {
+ editor.dom.setAttribs( link, { 'data-wp-edit': true } );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.execCommand( 'mceInsertLink', false, { href: '_wp_link_placeholder' } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.nodeChanged();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- editor.nodeChanged();
</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"> editor.addCommand( 'wp_link_apply', function() {
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></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/version.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/version.php 2016-02-05 19:02:51 UTC (rev 36482)
+++ trunk/src/wp-includes/version.php 2016-02-06 00:50:31 UTC (rev 36483)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $tinymce_version
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$tinymce_version = '4303-20160119';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$tinymce_version = '4303-20160205';
</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"> * Holds the required PHP version
</span></span></pre>
</div>
</div>
</body>
</html>