Ticket #46071: 46071.diff

src/js/_enqueues/lib/link.js

@@ -5 +5 @@
  /* global wpLink */
 
 ( function( $, wpLinkL10n, wp ) {
-        var editor, searchTimer, River, Query, correctedURL, linkNode,
+        var editor, searchTimer, River, Query, correctedURL,
                 emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,63}$/i,
                 urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,63}[^ "]*$/i,
                 inputs = {},
@@ -13 +13 @@
                 isTouch = ( 'ontouchend' in document );
 
         function getLink() {
-                return linkNode || editor.dom.getParent( editor.selection.getNode(), 'a[href]' );
+                if ( editor ) {
+                        return editor.$( 'a[data-wplink-edit="true"]' );
+                }
+
+                return null;
         }
 
         window.wpLink = {
@@ -97 +101 @@
                         }
                 },
 
-                open: function( editorId, url, text, node ) {
+                open: function( editorId, url, text ) {
                         var ed,
                                 $body = $( document.body );
 
                         $body.addClass( 'modal-open' );
                         wpLink.modalOpen = true;
-                        linkNode = node;
 
                         wpLink.range = null;
 
@@ -205 +208 @@
                                 return false;
                         }
 
-                        if ( linkNode ) {
-                                nodes = linkNode.childNodes;
+                        if ( linkNode.length ) {
+                                nodes = linkNode[0].childNodes;
 
-                                if ( nodes.length === 0 ) {
+                                if ( ! nodes || ! nodes.length ) {
                                         return false;
                                 }
 
@@ -229 +232 @@
                                 linkNode = getLink(),
                                 onlyText = this.hasSelectedText( linkNode );
 
-                        if ( linkNode ) {
-                                linkText = linkNode.textContent || linkNode.innerText;
-                                href = editor.dom.getAttrib( linkNode, 'href' );
+                        if ( linkNode.length ) {
+                                linkText = linkNode.text();
+                                href = linkNode.attr( 'href' );
 
                                 if ( ! $.trim( linkText ) ) {
                                         linkText = text || '';
@@ -243 +246 @@
 
                                 if ( href !== '_wp_link_placeholder' ) {
                                         inputs.url.val( href );
-                                        inputs.openInNewTab.prop( 'checked', '_blank' === editor.dom.getAttrib( linkNode, 'target' ) );
+                                        inputs.openInNewTab.prop( 'checked', '_blank' === linkNode.attr( 'target' ) );
                                         inputs.submit.val( wpLinkL10n.update );
                                 } else {
                                         this.setDefaultValues( linkText );
@@ -414 +417 @@
                                 return;
                         }
 
-                        $link = editor.$( getLink() );
+                        $link = getLink();
 
                         editor.undoManager.transact( function() {
                                 if ( ! $link.length ) {
@@ -437 +440 @@
                                         }
 
                                         attrs['data-wplink-edit'] = null;
-                                        attrs['data-mce-href'] = null; // attrs.href
+                                        attrs['data-mce-href'] = attrs.href;
                                         $link.attr( attrs );
                                 }
                         } );
@@ -446 +449 @@
                         editor.focus();
 
                         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] );
@@ -468 +464 @@
 
                 updateFields: function( e, li ) {
                         inputs.url.val( li.children( '.item-permalink' ).val() );
+
+                        if ( inputs.wrap.hasClass( 'has-text-field' ) && ! inputs.text.val() ) {
+                                inputs.text.val( li.children( '.item-title' ).text() );
+                        }
                 },
 
                 getUrlFromSelection: function( selection ) {

src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js

@@ -226 +226 @@
                         linkNode = getSelectedLink();
                         editToolbar.tempHide = false;
 
-                        if ( linkNode ) {
-                                editor.dom.setAttribs( linkNode, { 'data-wplink-edit': true } );
-                        } else {
+                        if ( ! linkNode ) {
                                 removePlaceholders();
                                 editor.execCommand( 'mceInsertLink', false, { href: '_wp_link_placeholder' } );
 
@@ -235 +233 @@
                                 linkNode = editor.$( 'a[href="_wp_link_placeholder"]' )[0];
                                 editor.nodeChanged();
                         }
+
+                        editor.dom.setAttribs( linkNode, { 'data-wplink-edit': true } );
                 } );
 
                 editor.addCommand( 'wp_link_apply', function() {
@@ -284 +284 @@
                 } );
 
                 editor.addCommand( 'wp_link_cancel', function() {
+                        inputInstance.reset();
+
                         if ( ! editToolbar.tempHide ) {
-                                inputInstance.reset();
                                 removePlaceholders();
                         }
                 } );
@@ -583 +584 @@
                                         var url = inputInstance.getURL() || null,
                                                 text = inputInstance.getLinkText() || null;
 
-                                        /*
-                                         * 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
-                                        }
+                                        window.wpLink.open( editor.id, url, text );
 
                                         editToolbar.tempHide = true;
-                                        window.wpLink.open( editor.id, url, text, linkNode );
-
-                                        inputInstance.reset();
+                                        editToolbar.hide();
                                 }
                         }
                 } );