<!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>[38808] trunk/src/wp-includes/js/wplink.js: TinyMCE wplink:</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/38808">38808</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/38808","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-10-17 20:00:53 +0000 (Mon, 17 Oct 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 wplink:
- Remove the calls to getBookmark() and moveToBookmark() in IE. This is handled automatically when blurring and focusing the editor.
- When inserting a link, move it out of the caret position element. If not, it may be removed with that element on clean-up before save.
Fixes <a href="https://core.trac.wordpress.org/ticket/38335">#38335</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-10-17 16:22:14 UTC (rev 38807)
+++ trunk/src/wp-includes/js/wplink.js 2016-10-17 20:00:53 UTC (rev 38808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,10 +125,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> editor = 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">-
- if ( editor && window.tinymce.isIE ) {
- editor.windowManager.wplinkBookmark = editor.selection.getBookmark();
- }
</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"> if ( ! wpLink.isMCE() && document.selection ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,10 +302,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> getAttrs: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> wpLink.correctURL();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return {
- href: $.trim( inputs.url.val() ),
- target: inputs.openInNewTab.prop( 'checked' ) ? '_blank' : ''
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var attrs = {
+ href: $.trim( inputs.url.val() )
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( inputs.openInNewTab.prop( 'checked' ) ) {
+ attrs.target = '_blank';
+ }
+
+ return attrs;
</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"> buildHtml: function(attrs) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,53 +392,62 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> mceUpdate: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var attrs = wpLink.getAttrs(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- link, text;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link, text, hasText, $mceCaret;
</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 ( window.tinymce.isIE && editor.windowManager.wplinkBookmark ) {
- editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
- editor.windowManager.wplinkBookmark = null;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! attrs.href ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.execCommand( 'unlink' );
</span><span class="cx" style="display: block; padding: 0 10px"> wpLink.close();
</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 = getLink();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = editor.$( getLink() );
</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 ( inputs.wrap.hasClass( 'has-text-field' ) ) {
- text = inputs.text.val() || attrs.href;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.undoManager.transact( function() {
+ if ( ! $link.length ) {
+ editor.execCommand( 'mceInsertLink', false, { href: '_wp_link_placeholder', 'data-wp-temp-link': 1 } );
+ $link = editor.$( 'a[data-wp-temp-link="1"]' ).removeAttr( 'data-wp-temp-link' );
+ hasText = $.trim( $link.text() );
+ }
</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 ( link ) {
- if ( text ) {
- if ( 'innerText' in link ) {
- link.innerText = text;
- } else {
- link.textContent = text;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $link.length ) {
+ editor.execCommand( 'unlink' );
+ } else {
+ if ( inputs.wrap.hasClass( 'has-text-field' ) ) {
+ text = inputs.text.val();
+
+ if ( text ) {
+ $link.text( text );
+ } else if ( ! hasText ) {
+ $link.text( attrs.href );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Not editing any more
- attrs['data-wplink-edit'] = null;
- editor.dom.setAttribs( link, attrs );
- } else {
- if ( text ) {
- editor.selection.setNode( editor.dom.create( 'a', attrs, editor.dom.encode( text ) ) );
- } else {
- editor.execCommand( 'mceInsertLink', false, attrs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attrs['data-wplink-edit'] = null;
+ attrs['data-mce-href'] = null; // attrs.href
+ $link.attr( attrs );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wpLink.close( 'noReset' );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.focus();
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( link && editor.plugins.wplink ) {
- editor.plugins.wplink.checkLink( link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $link.length ) {
+ $mceCaret = $link.parent( '#_mce_caret' );
+
+ if ( $mceCaret.length ) {
+ $mceCaret.before( $link.removeAttr( 'data-mce-bogus' ) );
+ }
+
+ editor.selection.select( $link[0] );
+ editor.selection.collapse();
+
+ if ( editor.plugins.wplink ) {
+ editor.plugins.wplink.checkLink( $link[0] );
+ }
</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">+ editor.nodeChanged();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Audible confirmation message when a link has been inserted in the Editor.
</span><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( wpLinkL10n.linkInserted );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre>
</div>
</div>
</body>
</html>