From e18603ce49ccefca7f5ba00f1b898391ba403096 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 14 Jan 2014 05:51:41 +0000
Subject: [PATCH] TinyMCE: add/remove the 'alignnone' class when aligning
 images without captions. See #24067.

git-svn-id: https://develop.svn.wordpress.org/trunk@26942 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../js/tinymce/plugins/wpeditimage/plugin.js          | 11 ++++++++++-
 src/wp-includes/version.php                           |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
index 50db0d984a..3f4ca1036e 100644
--- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
@@ -364,7 +364,6 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 				}
 			}
 		} else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' ) {
-			// When inside an image caption, set the align* class on dt.wp-caption
 			node = editor.selection.getNode();
 			align = cmd.substr(7).toLowerCase();
 			align = 'align' + align;
@@ -376,6 +375,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 			}
 
 			if ( DL ) {
+				// When inside an image caption, set the align* class on dl.wp-caption
 				if ( dom.hasClass( DL, align ) ) {
 					dom.removeClass( DL, align );
 					dom.addClass( DL, 'alignnone' );
@@ -386,6 +386,15 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 
 				return false;
 			}
+
+			if ( node.nodeName === 'IMG' ) {
+				if ( dom.hasClass( node, align ) ) {
+					// The align class is being removed
+					dom.addClass( node, 'alignnone' );
+				} else {
+					dom.removeClass( node, 'alignnone' );
+				}
+			}
 		}
 	});
 
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index 8001ba963e..cd390bd7fd 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -18,7 +18,7 @@ $wp_db_version = 26691;
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '4012-20140109';
+$tinymce_version = '4012-20140113';
 
 /**
  * Holds the required PHP version