TinyMCE: Fix cursor position after updating a wpview node. Fix hiding…

… the inline toolbar on editor blur. Props iseulde, azaozz. Fixes #40480 for trunk. Built from https://develop.svn.wordpress.org/trunk@40481 git-svn-id: http://core.svn.wordpress.org/trunk@40357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
nocra · Apr 19, 2017 · c0399b4 · c0399b4
1 parent 1d739a0
commit c0399b4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/wp-includes/js/mce-view.js b/wp-includes/js/mce-view.js
@@ -729,6 +729,9 @@
 					$( node ).data( 'rendered', false );
 					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();
 
 					return true;

diff --git a/wp-includes/js/mce-view.min.js b/wp-includes/js/mce-view.min.js
diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -992,7 +992,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 		function hide( event ) {
 			if ( activeToolbar ) {
-				if ( activeToolbar.tempHide || event.type === 'hide' ) {
+				if ( activeToolbar.tempHide || event.type === 'hide' || event.type === 'blur' ) {
 					activeToolbar.hide();
 					activeToolbar = false;
 				} else if ( (