Changeset 36716

Timestamp:

02/26/2016 12:20:54 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE, inline link:

• Make sure the inline dialog is not showing under the advanced modal.
• Fix checking if the link node contains text.
• Fix undo levels so all actions can be undone and redone.

See #33301.

Location:

trunk/src/wp-includes/js

Files:

• tinymce/plugins/wordpress/plugin.js (modified) (1 diff)
• tinymce/plugins/wplink/plugin.js (modified) (5 diffs)
• wplink.js (modified) (3 diffs)

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

@@ -886 +886 @@
                 function hide( event ) {
                         if ( activeToolbar ) {
-                                if ( event.type === 'hide' ) {
+                                if ( activeToolbar.tempHide || event.type === 'hide' ) {
                                         activeToolbar.hide();
                                         activeToolbar = false;

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

@@ -224 +224 @@
 
                 editor.addCommand( 'wp_link_cancel', function() {
-                        inputInstance.reset();
-                        removePlaceholders();
-                        editor.focus();
-
-                        if ( tinymce.isIE ) {
-                                editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
-                                editor.windowManager.wplinkBookmark = null;
+                        if ( ! editToolbar.tempHide ) {
+                                inputInstance.reset();
+                                removePlaceholders();
+                                editor.focus();
+        
+                                if ( tinymce.isIE ) {
+                                        editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
+                                        editor.windowManager.wplinkBookmark = null;
+                                }
+                                
+                                editToolbar.tempHide = false;
                         }
                 } );
@@ -286 +290 @@
                 // Prevent adding undo levels on inserting link placeholder.
                 editor.on( 'BeforeAddUndo', function( event ) {
-                        if ( event.level.content ) {
-                                event.level.content = removePlaceholderStrings( event.level.content );
+                        if ( event.lastLevel && event.lastLevel.content && event.level.content &&
+                                event.lastLevel.content === removePlaceholderStrings( event.level.content ) ) {
+
+                                event.preventDefault();
                         }
                 });
@@ -389 +395 @@
 
                         if ( tinymce.$( document.body ).hasClass( 'modal-open' ) ) {
+                                editToolbar.tempHide = true;
                                 return;
                         }
+
+                        editToolbar.tempHide = false;
 
                         if ( linkNode ) {
@@ -433 +442 @@
                                                 text = inputInstance.getLinkText() || null;
 
-                                        editor.focus();
+                                        editor.focus(); // Needed for IE
                                         window.wpLink.open( editor.id, url, text );
+
+                                        editToolbar.tempHide = true;
                                         inputInstance.reset();
                                 }
@@ -448 +459 @@
 
                 return {
-                        hideEditToolbar: function() {
-                                editToolbar.hide();
+                        close: function() {
+                                editToolbar.tempHide = false;
+                                editor.execCommand( 'wp_link_cancel' );
                         }
                 };

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

@@ -245 +245 @@
 
                 mceRefresh: function( url, text ) {
-                        var linkNode = editor.dom.getParent( editor.selection.getNode(), 'a[href]' ),
+                        var linkText,
+                                linkNode = getLink(),
                                 onlyText = this.hasSelectedText( linkNode );
 
                         if ( linkNode ) {
-                                text = tinymce.trim( linkNode.innerText || linkNode.textContent ) || text;
+                                linkText = linkNode.innerText || linkNode.textContent;
+
+                                if ( ! tinymce.trim( linkText ) ) {
+                                        linkText = text || '';
+                                }
+
                                 url = url || editor.dom.getAttrib( linkNode, 'href' );
 
@@ -265 +271 @@
 
                         if ( onlyText ) {
-                                inputs.text.val( text || '' );
+                                inputs.text.val( linkText || '' );
                                 inputs.wrap.addClass( 'has-text-field' );
                         } else {
@@ -284 +290 @@
                                 }
                         } else {
-                                editor.plugins.wplink.hideEditToolbar();
+                                if ( editor.plugins.wplink ) {
+                                        editor.plugins.wplink.close();
+                                }
+
                                 editor.focus();
                         }