Changeset 26942

Timestamp:

01/14/2014 05:51:41 AM (13 years ago)

Author:

azaozz

Message:

TinyMCE: add/remove the 'alignnone' class when aligning images without captions. See #24067.

Location:

trunk/src/wp-includes

Files:

• js/tinymce/plugins/wpeditimage/plugin.js (modified) (3 diffs)
• version.php (modified) (1 diff)

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

@@ -365 +365 @@
                         }
                 } 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();
@@ -377 +376 @@
 
                         if ( DL ) {
+                                // When inside an image caption, set the align* class on dl.wp-caption
                                 if ( dom.hasClass( DL, align ) ) {
                                         dom.removeClass( DL, align );
@@ -387 +387 @@
                                 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' );
+                                }
+                        }
                 }
         });

trunk/src/wp-includes/version.php

@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '4012-20140109';
+$tinymce_version = '4012-20140113';
 
 /**