<!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>[44696] trunk/src/js/_enqueues: TinyMCE Classic Block: fix the Advanced Link modal (accessible when clicking on the cogwheel in the inline link modal in a Classic Block).</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="https://core.trac.wordpress.org/changeset/44696">44696</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/44696","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>2019-01-24 11:20:25 +0000 (Thu, 24 Jan 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'>TinyMCE Classic Block: fix the Advanced Link modal (accessible when clicking on the cogwheel in the inline link modal in a Classic Block).
Fixes <a href="https://core.trac.wordpress.org/ticket/46071">#46071</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesliblinkjs">trunk/src/js/_enqueues/lib/link.js</a></li>
<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswplinkpluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesliblinkjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/link.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/link.js 2019-01-24 11:10:34 UTC (rev 44695)
+++ trunk/src/js/_enqueues/lib/link.js 2019-01-24 11:20:25 UTC (rev 44696)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global wpLink */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $, wpLinkL10n, wp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var editor, searchTimer, River, Query, correctedURL, linkNode,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var editor, searchTimer, River, Query, correctedURL,
</ins><span class="cx" style="display: block; padding: 0 10px"> emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,63}$/i,
</span><span class="cx" style="display: block; padding: 0 10px"> urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,63}[^ "]*$/i,
</span><span class="cx" style="display: block; padding: 0 10px"> inputs = {},
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> isTouch = ( 'ontouchend' in document );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function getLink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return linkNode || editor.dom.getParent( editor.selection.getNode(), 'a[href]' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( editor ) {
+ return editor.$( 'a[data-wplink-edit="true"]' );
+ }
+
+ return null;
</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"> window.wpLink = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,13 +101,12 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- open: function( editorId, url, text, node ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ open: function( editorId, url, text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var ed,
</span><span class="cx" style="display: block; padding: 0 10px"> $body = $( document.body );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body.addClass( 'modal-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> wpLink.modalOpen = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- linkNode = node;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wpLink.range = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,10 +208,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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 ( linkNode ) {
- nodes = linkNode.childNodes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( linkNode.length ) {
+ nodes = linkNode[0].childNodes;
</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 ( nodes.length === 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! nodes || ! nodes.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">@@ -229,9 +232,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> linkNode = getLink(),
</span><span class="cx" style="display: block; padding: 0 10px"> onlyText = this.hasSelectedText( linkNode );
</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 ( linkNode ) {
- linkText = linkNode.textContent || linkNode.innerText;
- href = editor.dom.getAttrib( linkNode, 'href' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( linkNode.length ) {
+ linkText = linkNode.text();
+ href = linkNode.attr( 'href' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $.trim( linkText ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> linkText = text || '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( href !== '_wp_link_placeholder' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> inputs.url.val( href );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inputs.openInNewTab.prop( 'checked', '_blank' === editor.dom.getAttrib( linkNode, 'target' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ inputs.openInNewTab.prop( 'checked', '_blank' === linkNode.attr( 'target' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> inputs.submit.val( wpLinkL10n.update );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.setDefaultValues( linkText );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,7 +417,7 @@
</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">- $link = editor.$( getLink() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = getLink();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.undoManager.transact( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $link.length ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +440,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"> attrs['data-wplink-edit'] = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attrs['data-mce-href'] = null; // attrs.href
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attrs['data-mce-href'] = attrs.href;
</ins><span class="cx" style="display: block; padding: 0 10px"> $link.attr( attrs );
</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">@@ -446,14 +449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.focus();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $link.length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mceCaret = $link.parent( '#_mce_caret' );
-
- if ( $mceCaret.length ) {
- $mceCaret.before( $link.removeAttr( 'data-mce-bogus' ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> editor.selection.select( $link[0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.selection.collapse();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( editor.plugins.wplink ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.plugins.wplink.checkLink( $link[0] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,6 +464,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> updateFields: function( e, li ) {
</span><span class="cx" style="display: block; padding: 0 10px"> inputs.url.val( li.children( '.item-permalink' ).val() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( inputs.wrap.hasClass( 'has-text-field' ) && ! inputs.text.val() ) {
+ inputs.text.val( li.children( '.item-title' ).text() );
+ }
</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"> getUrlFromSelection: function( selection ) {
</span></span></pre></div>
<a id="trunksrcjs_enqueuesvendortinymcepluginswplinkpluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js 2019-01-24 11:10:34 UTC (rev 44695)
+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js 2019-01-24 11:20:25 UTC (rev 44696)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,9 +226,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> linkNode = getSelectedLink();
</span><span class="cx" style="display: block; padding: 0 10px"> editToolbar.tempHide = false;
</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 ( linkNode ) {
- editor.dom.setAttribs( linkNode, { 'data-wplink-edit': true } );
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! linkNode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> removePlaceholders();
</span><span class="cx" style="display: block; padding: 0 10px"> editor.execCommand( 'mceInsertLink', false, { href: '_wp_link_placeholder' } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,6 +233,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> linkNode = editor.$( 'a[href="_wp_link_placeholder"]' )[0];
</span><span class="cx" style="display: block; padding: 0 10px"> editor.nodeChanged();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ editor.dom.setAttribs( linkNode, { 'data-wplink-edit': true } );
</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"> editor.addCommand( 'wp_link_apply', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,8 +284,9 @@
</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_cancel', function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ inputInstance.reset();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! editToolbar.tempHide ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inputInstance.reset();
</del><span class="cx" style="display: block; padding: 0 10px"> removePlaceholders();
</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">@@ -583,24 +584,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var url = inputInstance.getURL() || null,
</span><span class="cx" style="display: block; padding: 0 10px"> text = inputInstance.getLinkText() || null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * Accessibility note: moving focus back to the editor confuses
- * screen readers. They will announce again the Editor ARIA role
- * `application` and the iframe `title` attribute.
- *
- * Unfortunately IE looses the selection when the editor iframe
- * looses focus, so without returning focus to the editor, the code
- * in the modal will not be able to get the selection, place the caret
- * at the same location, etc.
- */
- if ( tinymce.Env.ie ) {
- editor.focus(); // Needed for IE
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.wpLink.open( editor.id, url, text );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editToolbar.tempHide = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.wpLink.open( editor.id, url, text, linkNode );
-
- inputInstance.reset();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editToolbar.hide();
</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>
</div>
</body>
</html>