Changeset 36483

Timestamp:

02/06/2016 12:50:31 AM (9 years ago)

Author:

azaozz

Message:

TinyMCE inline link:

• Fix not displaying anything when the URL is only a fragment. Show the whole URL.
• Fix editing a link when it is the very first word in the editor.
• Fix editing a link then some of the surrounding text or space is selected. Change the selection to only the link node.
• Add placeholder when adding new link.

See #33301.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/plugins/wplink/plugin.js (modified) (5 diffs)
• version.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -1044 +1044 @@
             'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
             'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
+            'Paste URL or type to search' => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog
 
             // Shortcuts help modal

trunk/src/wp-includes/js/tinymce/plugins/wplink/plugin.js

@@ -33 +33 @@
                 }
 
+                // If nothing's left (maybe the URL was just a fragment), use the whole URL.
+                if ( url === '' ) {
+                    url = this.url;
+                }
+
                 // If the URL is longer that 40 chars, concatenate the beginning (after the domain) and ending with ...
                 if ( url.length > 40 && ( index = url.indexOf( '/' ) ) !== -1 && ( lastIndex = url.lastIndexOf( '/' ) ) !== -1 && lastIndex !== index ) {
@@ -52 +57 @@
             return (
                 '<div id="' + this._id + '" class="wp-link-input">' +
-                    '<input type="text" value="" tabindex="-1" />' +
+                    '<input type="text" value="" tabindex="-1" placeholder="' + tinymce.translate('Paste URL or type to search') + '" />' +
                 '</div>'
             );
@@ -69 +74 @@
         var $ = window.jQuery;
 
+        function getSelectedLink() {
+            var href,
+                selectedNode = editor.selection.getNode(),
+                selectedText = editor.selection.getContent(),
+                link = editor.dom.getParent( selectedNode, 'a[href]' );
+
+            if ( ! link && selectedText.indexOf( '</a>' ) !== -1 ) {
+                href = selectedText.match( /href="([^">]+)"/ );
+
+                if ( href && href[1] ) {
+                    link = editor.$( 'a[href="' + href[1] + '"]', selectedNode )[0];
+                }
+
+                if ( link ) {
+                    editor.selection.select( link );
+                    editor.nodeChanged();
+                }
+            }
+
+            return link;
+        }
+
         editor.on( 'preinit', function() {
             if ( editor.wp && editor.wp._createToolbar ) {
@@ -84 +111 @@
 
                 editToolbar.on( 'show', function() {
-                    var node = editToolbar.find( 'toolbar' )[0];
-                    node && node.focus( true );
-                    a = editor.dom.getParent( editor.selection.getNode(), 'a' );
+                    var inputNode = editToolbar.find( 'toolbar' )[0];
+
+                    inputNode && inputNode.focus( true );
+                    a = getSelectedLink();
                 } );
 
@@ -96 +124 @@
 
         editor.addCommand( 'WP_Link', function() {
-            var a = editor.dom.getParent( editor.selection.getNode(), 'a' );
-
-            if ( a ) {
-                editor.dom.setAttribs( a, { 'data-wp-edit': true } );
+            var link = getSelectedLink();
+
+            if ( link ) {
+                editor.dom.setAttribs( link, { 'data-wp-edit': true } );
             } else {
                 editor.execCommand( 'mceInsertLink', false, { href: '_wp_link_placeholder' } );
-            }
-
-            editor.nodeChanged();
+                editor.nodeChanged();
+            }
         } );
 

trunk/src/wp-includes/version.php

@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '4303-20160119';
+$tinymce_version = '4303-20160205';
 
 /**