Changeset 40482

Timestamp:

04/19/2017 10:17:25 PM (7 years ago)

Author:

azaozz

Message:

TinyMCE: Fix cursor position after updating a wpview node. Fix hiding the inline toolbar on editor blur.

Props iseulde, azaozz.

Merges [40481] to the 4.7 branch.
Fixes #40480.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/js/mce-view.js (modified) (1 diff)
• src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)

branches/4.7/src/wp-includes/js/mce-view.js

@@ -709 +709 @@
                     editor.dom.setAttrib( node, 'data-wpview-text', encodeURIComponent( text ) );
                     wp.mce.views.createInstance( type, text, match.options, force ).render();
+
+                    editor.selection.select( node );
+                    editor.nodeChanged();
                     editor.focus();
 

branches/4.7/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

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