<!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>[36602] trunk/src/wp-includes/js: TinyMCE, inline link dialog:</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/36602">36602</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/36602","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-20 21:35:54 +0000 (Sat, 20 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 dialog:
- Fix passing values to the (old) modal on open when non-linked text is selected and Advanced is clicked before pasting an URL.
- When the user has selected text partially including a link and opens the editing dialog, auto-select the link only. Helps when a linked word is selected by double-clicking.
- Remove all placeholders on saving.
- Do not add undo level on inserting link placeholder.
- Remove the placeholder when canceling from the modal.

See <a href="https://core.trac.wordpress.org/ticket/33301">#33301</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<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="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-20 21:26:26 UTC (rev 36601)
+++ trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js   2016-02-20 21:35:54 UTC (rev 36602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</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="cx" style="display: block; padding: 0 10px">                                        if ( index + url.length - lastIndex < 40 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                lastIndex =  -( 40 - ( index + 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         lastIndex = -( 40 - ( index + 1 ) );
</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">                                        url = url.slice( 0, index + 1 ) + '\u2026' + url.slice( lastIndex );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,27 +74,50 @@
</span><span class="cx" style="display: block; padding: 0 10px">                var $ = window.jQuery;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                function getSelectedLink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        var href,
-                               selectedNode = editor.selection.getNode(),
-                               selectedText = editor.selection.getContent(),
-                               link = editor.dom.getParent( selectedNode, 'a[href]' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 var href, html
+                               node = editor.selection.getNode();
+                               link = editor.dom.getParent( node, 'a[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">-                        if ( ! link && selectedText.indexOf( '</a>' ) !== -1 ) {
-                               href = selectedText.match( /href="([^">]+)"/ );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! link ) {
+                               html = editor.selection.getContent({ format: 'raw' });
</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 ( href && href[1] ) {
-                                       link = editor.$( 'a[href="' + href[1] + '"]', selectedNode )[0];
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( html && html.indexOf( '</a>' ) !== -1 ) {
+                                       href = html.match( /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">-                                if ( link ) {
-                                       editor.selection.select( link );
-                                       editor.nodeChanged();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 if ( href && href[1] ) {
+                                               link = editor.$( 'a[href="' + href[1] + '"]', node )[0];
+                                       }
+
+                                       if ( link ) {
+                                               editor.selection.select( link );
+                                               editor.nodeChanged();
+                                       }
</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="cx" style="display: block; padding: 0 10px">                        return link;
</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 removePlaceholders() {
+                       editor.$( 'a' ).each( function( i, element ) {
+                               var $element = editor.$( element );
</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 ( $element.attr( 'href' ) === '_wp_link_placeholder' ) {
+                                       editor.dom.remove( element, true );
+                               } else if ( $element.attr( 'data-wp-link-edit' ) ) {
+                                       $element.attr( 'data-wp-link-edit', null );
+                               }
+                       });
+               }
+               
+               function removePlaceholderStrings( content, dataAttr ) {
+                       if ( dataAttr ) {
+                               content = content.replace( / data-wp-link-edit="true"/g, '' );
+                       }
+
+                       return content.replace( /<a [^>]*?href="_wp_link_placeholder"[^>]*>([\s\S]+)<\/a>/g, '$1' );
+               }
+
</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">@@ -126,9 +149,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        var link = getSelectedLink();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( link ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                editor.dom.setAttribs( link, { 'data-wp-edit': true } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         editor.dom.setAttribs( link, { 'data-wp-link-edit': true } );
</ins><span class="cx" style="display: block; padding: 0 10px">                         } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                removePlaceholders();
+
</ins><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.selection.select( editor.$( 'a[href="_wp_link_placeholder"]' )[0] );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 editor.nodeChanged();
</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">@@ -150,7 +176,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 ( a ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                editor.dom.setAttribs( a, { href: href, 'data-wp-edit': null } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         editor.dom.setAttribs( a, { href: href, 'data-wp-link-edit': 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">                        a = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,16 +186,8 @@
</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">-                        if ( a ) {
-                               if ( editor.$( a ).attr( 'href' ) === '_wp_link_placeholder' ) {
-                                       editor.dom.remove( a, true );
-                               } else {
-                                       editor.dom.setAttribs( a, { 'data-wp-edit': null } );
-                               }
-                       }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 removePlaceholders();
</ins><span class="cx" style="display: block; padding: 0 10px">                         a = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                         editor.nodeChanged();
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,6 +236,18 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                
+               // Remove any remaining placeholders on saving.
+               editor.on( 'savecontent', function( event ) {
+                       event.content = removePlaceholderStrings( event.content, true );
+               });
+               
+               // Prevent adding undo levels on inserting link placeholder.
+               editor.on( 'BeforeAddUndo', function( event ) {
+                       if ( event.level.content ) {
+                               event.level.content = removePlaceholderStrings( event.level.content );
+                       }
+               });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                editor.addButton( 'wp_link_preview', {
</span><span class="cx" style="display: block; padding: 0 10px">                        type: 'WPLinkPreview',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                inputInstance = this;
</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 ( $ ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( $ && $.ui && $.ui.autocomplete ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $( input )
</span><span class="cx" style="display: block; padding: 0 10px">                                        .on( 'keydown', function() {
</span><span class="cx" style="display: block; padding: 0 10px">                                                $( input ).removeAttr( 'aria-activedescendant' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,13 +341,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                editor.on( 'wptoolbar', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        var anchor = editor.dom.getParent( event.element, 'a' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $anchor,
-                               href, edit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $anchor, href, edit;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( anchor ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $anchor = editor.$( anchor );
</span><span class="cx" style="display: block; padding: 0 10px">                                href = $anchor.attr( 'href' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                edit = $anchor.attr( 'data-wp-edit' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         edit = $anchor.attr( 'data-wp-link-edit' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( href === '_wp_link_placeholder' || edit ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        inputInstance.setURL( edit ? href : '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,8 +377,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        tooltip: 'Advanced',
</span><span class="cx" style="display: block; padding: 0 10px">                        icon: 'dashicon dashicons-admin-generic',
</span><span class="cx" style="display: block; padding: 0 10px">                        onclick: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                editor.execCommand( 'wp_link_apply' );
-                               window.wpLink && window.wpLink.open( editor.id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( typeof window.wpLink !== 'undefined' ) {
+                                       if ( inputInstance.getEl().firstChild.value ) {
+                                               editor.execCommand( 'wp_link_apply' );
+                                       }
+
+                                       window.wpLink.open( editor.id );
+                               }
</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-20 21:26:26 UTC (rev 36601)
+++ trunk/src/wp-includes/js/wplink.js  2016-02-20 21:35:54 UTC (rev 36602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,14 +219,20 @@
</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() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        var text,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 var text, url,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 selectedNode = editor.selection.getNode(),
</span><span class="cx" style="display: block; padding: 0 10px">                                linkNode = editor.dom.getParent( selectedNode, 'a[href]' ),
</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><span class="cx" style="display: block; padding: 0 10px">                        if ( linkNode ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                text = linkNode.innerText || linkNode.textContent;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                inputs.url.val( editor.dom.getAttrib( linkNode, 'href' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         url = editor.dom.getAttrib( linkNode, 'href' );
+
+                               if ( url === '_wp_link_placeholder' ) {
+                                       url = '';
+                               }
+
+                               inputs.url.val( url );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 inputs.openInNewTab.prop( 'checked', '_blank' === editor.dom.getAttrib( linkNode, 'target' ) );
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,6 +250,8 @@
</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">                close: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        var linkNode;
+                       
</ins><span class="cx" style="display: block; padding: 0 10px">                         $( document.body ).removeClass( 'modal-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! wpLink.isMCE() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,6 +262,12 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                linkNode = editor.dom.getParent( editor.selection.getNode(), 'a[href]' );
+
+                               if ( linkNode && editor.dom.getAttrib( linkNode, 'href' ) === '_wp_link_placeholder' ) {
+                                       editor.dom.remove( linkNode, true );
+                               }
+
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +366,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        var attrs = wpLink.getAttrs(),
</span><span class="cx" style="display: block; padding: 0 10px">                                link, text;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        wpLink.close();
</del><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 ( tinymce.isIE ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,6 +401,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"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        wpLink.close();
</ins><span class="cx" style="display: block; padding: 0 10px">                         editor.nodeChanged();
</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>