From 040ac15f50fcdfe5dcb0445997aee71859aac3f7 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Mon, 4 Aug 2014 00:51:19 +0000
Subject: [PATCH] TinyMCE: fix alignment buttons when used on image with
 caption. Remove old/unneeded code. Fixes #28705.

git-svn-id: https://develop.svn.wordpress.org/trunk@29370 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../js/tinymce/plugins/wpeditimage/plugin.js  | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
index bf9e0790d6..b1350e409b 100644
--- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
@@ -794,29 +794,15 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 				dom.insertAfter( p, node );
 				editor.selection.setCursorLocation( p, 0 );
 				editor.nodeChanged();
-
-				if ( tinymce.Env.ie > 8 ) {
-					setTimeout( function() {
-						editor.selection.setCursorLocation( p, 0 );
-						editor.selection.setContent( event.value );
-					}, 500 );
-
-					return false;
-				}
 			}
 		} else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' ) {
 			node = editor.selection.getNode();
 			align = cmd.substr(7).toLowerCase();
-			align = 'align' + align;
+			align = 'align' + align,
+			DL = dom.getParent( node, 'dl.wp-caption' );
 
 			removeToolbar();
 
-			if ( dom.is( node, 'dl.wp-caption' ) ) {
-				DL = node;
-			} else {
-				DL = dom.getParent( node, 'dl.wp-caption' );
-			}
-
 			if ( DL ) {
 				// When inside an image caption, set the align* class on dl.wp-caption
 				if ( dom.hasClass( DL, align ) ) {
@@ -827,7 +813,12 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 					dom.addClass( DL, align );
 				}
 
-				return false;
+				if ( node.nodeName === 'IMG' ) {
+					// Re-select the image to update resize handles, etc.
+					editor.nodeChanged();
+				}
+
+				event.preventDefault();
 			}
 
 			if ( node.nodeName === 'IMG' ) {