<!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>[36716] trunk/src/wp-includes/js: 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/36716">36716</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/36716","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-26 00:20:54 +0000 (Fri, 26 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:
- Make sure the inline dialog is not showing under the advanced modal.
- Fix checking if the link node contains text.
- Fix undo levels so all actions can be undone and redone.
See <a href="https://core.trac.wordpress.org/ticket/33301">#33301</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswplinkpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></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/wordpress/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/wordpress/plugin.js 2016-02-25 21:59:56 UTC (rev 36715)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2016-02-26 00:20:54 UTC (rev 36716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -885,7 +885,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function hide( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( activeToolbar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( event.type === 'hide' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( activeToolbar.tempHide || event.type === 'hide' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> activeToolbar.hide();
</span><span class="cx" style="display: block; padding: 0 10px"> activeToolbar = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ( event.type === 'resize' || event.type === 'scroll' ) && ! activeToolbar.blockHide ) {
</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-25 21:59:56 UTC (rev 36715)
+++ trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js 2016-02-26 00:20:54 UTC (rev 36716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,13 +223,17 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inputInstance.reset();
- removePlaceholders();
- editor.focus();
-
- if ( tinymce.isIE ) {
- editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
- editor.windowManager.wplinkBookmark = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! editToolbar.tempHide ) {
+ inputInstance.reset();
+ removePlaceholders();
+ editor.focus();
+
+ if ( tinymce.isIE ) {
+ editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
+ editor.windowManager.wplinkBookmark = null;
+ }
+
+ editToolbar.tempHide = 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">@@ -285,8 +289,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent adding undo levels on inserting link placeholder.
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'BeforeAddUndo', function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( event.level.content ) {
- event.level.content = removePlaceholderStrings( event.level.content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( event.lastLevel && event.lastLevel.content && event.level.content &&
+ event.lastLevel.content === removePlaceholderStrings( event.level.content ) ) {
+
+ event.preventDefault();
</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">@@ -388,9 +394,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $linkNode, href, edit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( tinymce.$( document.body ).hasClass( 'modal-open' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editToolbar.tempHide = true;
</ins><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editToolbar.tempHide = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( linkNode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $linkNode = editor.$( linkNode );
</span><span class="cx" style="display: block; padding: 0 10px"> href = $linkNode.attr( 'href' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,8 +441,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">- editor.focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.focus(); // Needed for IE
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wpLink.open( editor.id, url, text );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ editToolbar.tempHide = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> inputInstance.reset();
</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">@@ -447,8 +458,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"> return {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- hideEditToolbar: function() {
- editToolbar.hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ close: function() {
+ editToolbar.tempHide = false;
+ editor.execCommand( 'wp_link_cancel' );
</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="trunksrcwpincludesjswplinkjs"></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/wplink.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wplink.js 2016-02-25 21:59:56 UTC (rev 36715)
+++ trunk/src/wp-includes/js/wplink.js 2016-02-26 00:20:54 UTC (rev 36716)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,11 +244,17 @@
</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"> mceRefresh: function( url, text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var linkNode = editor.dom.getParent( editor.selection.getNode(), 'a[href]' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var linkText,
+ linkNode = getLink(),
</ins><span class="cx" style="display: block; padding: 0 10px"> onlyText = this.hasSelectedText( linkNode );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( linkNode ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text = tinymce.trim( linkNode.innerText || linkNode.textContent ) || text;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ linkText = linkNode.innerText || linkNode.textContent;
+
+ if ( ! tinymce.trim( linkText ) ) {
+ linkText = text || '';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> url = url || editor.dom.getAttrib( linkNode, 'href' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( url === '_wp_link_placeholder' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +270,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 ( onlyText ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inputs.text.val( text || '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ inputs.text.val( linkText || '' );
</ins><span class="cx" style="display: block; padding: 0 10px"> inputs.wrap.addClass( 'has-text-field' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> inputs.text.val( '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +289,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wpLink.range.select();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.plugins.wplink.hideEditToolbar();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( editor.plugins.wplink ) {
+ editor.plugins.wplink.close();
+ }
+
</ins><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">
</span></span></pre>
</div>
</div>
</body>
</html>