Changeset 36703

Timestamp:

02/25/2016 03:47:46 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE, inline link dialog:

• Reset the inline dialog when canceling the advanced modal. If there is a link it should be on the first stage: follow/preview link.
• Fix tabbing in the inline edit dialog.

See #33301.

Location:

trunk/src/wp-includes

Files:

• js/tinymce/plugins/wplink/plugin.js (modified) (2 diffs)
• js/wplink.js (modified) (4 diffs)
• version.php (modified) (1 diff)

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

@@ -58 +58 @@
                                 '<div id="' + this._id + '" class="wp-link-input">' +
                                         '<input type="text" value="" tabindex="-1" placeholder="' + tinymce.translate('Paste URL or type to search') + '" />' +
-                                        '<input type="hidden" value="" />' +
+                                        '<input type="text" style="display:none" value="" />' +
                                 '</div>'
                         );
@@ -446 +446 @@
                         classes: 'widget btn primary'
                 } );
+
+                return {
+                        hideEditToolbar: function() {
+                                editToolbar.hide();
+                        }
+                };
         } );
 } )( window.tinymce );

trunk/src/wp-includes/js/wplink.js

@@ -209 +209 @@
                                 // If this is moved above the selection changes,
                                 // IE will show a flashing cursor over the dialog.
-                                inputs.url.focus()[0].select();
+                                window.setTimeout( function() {
+                                        inputs.url.focus()[0].select();
+                                }, 100 );
                         }
 
@@ -243 +245 @@
 
                 mceRefresh: function( url, text ) {
-                        var selectedNode = editor.selection.getNode(),
-                                linkNode = editor.dom.getParent( selectedNode, 'a[href]' ),
+                        var linkNode = editor.dom.getParent( editor.selection.getNode(), 'a[href]' ),
                                 onlyText = this.hasSelectedText( linkNode );
 
@@ -273 +274 @@
 
                 close: function() {
-                        var linkNode;
-
                         $( document.body ).removeClass( 'modal-open' );
 
@@ -285 +284 @@
                                 }
                         } else {
-                                linkNode = editor.dom.getParent( editor.selection.getNode(), 'a[href]' );
-
-                                if ( linkNode && editor.dom.getAttrib( linkNode, 'href' ) === '_wp_link_placeholder' ) {
-                                        editor.dom.remove( linkNode, true );
-                                }
-
+                                editor.plugins.wplink.hideEditToolbar();
                                 editor.focus();
                         }

trunk/src/wp-includes/version.php

@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '4304-20160219';
+$tinymce_version = '4304-20160224';
 
 /**