Address feedback.

WordPress · Jul 5, 2018 · 41b3db4 · 41b3db4
1 parent d4cd16e
commit 41b3db4
Showing 1 changed file with 38 additions and 8 deletions.
diff --git a/core-blocks/image/index.js b/core-blocks/image/index.js
@@ -217,25 +217,55 @@ export const settings = {
 			/>
 		);
 
+		const figure = (
+			<figure className={ classes }>
+				{ href ? <a href={ href }>{ image }</a> : image }
+				{ caption && caption.length > 0 && <RichText.Content tagName="figcaption" value={ caption } /> }
+			</figure>
+		);
+
 		if ( 'left' === align || 'right' === align ) {
 			return (
 				<aside>
-					<figure className={ classes }>
-						{ href ? <a href={ href }>{ image }</a> : image }
-						{ caption && caption.length > 0 && <RichText.Content tagName="figcaption" value={ caption } /> }
-					</figure>
+					{ figure }
 				</aside>
 			);
 		}
+
 		return (
-			<figure className={ classes }>
-				{ href ? <a href={ href }>{ image }</a> : image }
-				{ caption && caption.length > 0 && <RichText.Content tagName="figcaption" value={ caption } /> }
-			</figure>
+			{ figure }
 		);
 	},
 
 	deprecated: [
+		{
+			attributes: blockAttributes,
+			save( { attributes } ) {
+				const { url, alt, caption, align, href, width, height, id } = attributes;
+
+				const classes = classnames( {
+					[ `align${ align }` ]: align,
+					'is-resized': width || height,
+				} );
+
+				const image = (
+					<img
+						src={ url }
+						alt={ alt }
+						className={ id ? `wp-image-${ id }` : null }
+						width={ width }
+						height={ height }
+					/>
+				);
+
+				return (
+					<figure className={ classes }>
+						{ href ? <a href={ href }>{ image }</a> : image }
+						{ caption && caption.length > 0 && <RichText.Content tagName="figcaption" value={ caption } /> }
+					</figure>
+				);
+			},
+		},
 		{
 			attributes: blockAttributes,
 			save( { attributes } ) {