Changeset 31958

Timestamp:

04/01/2015 04:03:36 PM (9 years ago)

Author:

wonderboymusic

Message:

When editing an image from the editor, and the image has a value for alignment (but not for width or caption), don't bail without first checking that the alignment's value is not alignnone. If so, add the class to the <a> before bailing.

See #21848.

File:

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

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

@@ -179 +179 @@
                 width = ( width && width[1] ) ? width[1] : '';
 
+                classes = b.match( /class="([^"]*)"/ );
+                classes = ( classes && classes[1] ) ? classes[1] : '';
+                align = classes.match( /align[a-z]+/i ) || 'alignnone';
+
                 if ( ! width || ! caption ) {
+                    if ( 'alignnone' !== align[0] ) {
+                        c = c.replace( /><img/, ' class="' + align[0] + '"><img' );
+                    }
                     return c;
                 }
@@ -186 +193 @@
                 id = ( id && id[1] ) ? id[1] : '';
 
-                classes = b.match( /class="([^"]*)"/ );
-                classes = ( classes && classes[1] ) ? classes[1] : '';
-
-                align = classes.match( /align[a-z]+/i ) || 'alignnone';
                 classes = classes.replace( /wp-caption ?|align[a-z]+ ?/gi, '' );