Changeset 29370

Timestamp:

08/04/2014 12:51:19 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE: fix alignment buttons when used on image with caption. Remove old/unneeded code. Fixes #28705.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (2 diffs)

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

@@ -795 +795 @@
                 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 ) {
@@ -828 +814 @@
                 }
 
-                return false;
+                if ( node.nodeName === 'IMG' ) {
+                    // Re-select the image to update resize handles, etc.
+                    editor.nodeChanged();
+                }
+
+                event.preventDefault();
             }