Merge pull request #148 from ckeditor/t/147

Fix: Default style's command will properly remove model element's attribute. Closes #147.

src/imagestyle/imagestylecommand.js

@@ -79,7 +79,13 @@ export default class ImageStyleCommand extends Command {
 		doc.enqueueChanges( () => {
 			const batch = options.batch || doc.batch();
 
-			batch.setAttribute( imageElement, 'imageStyle', this.style.name );
+			// Default style means that there is no `imageStyle` attribute in the model.
+			// https://github.com/ckeditor/ckeditor5-image/issues/147
+			if ( this.style.isDefault ) {
+				batch.removeAttribute( imageElement, 'imageStyle' );
+			} else {
+				batch.setAttribute( imageElement, 'imageStyle', this.style.name );
+			}
 		} );
 	}
 }

tests/imagestyle/imagestylecommand.js

@@ -105,4 +105,21 @@ describe( 'ImageStyleCommand', () => {
 		expect( defaultStyleCommand.isEnabled ).to.be.false;
 		expect( otherStyleCommand.isEnabled ).to.be.false;
 	} );
+
+	it( 'default style should be active after executing it after another style', () => {
+		setData( document, '[<image></image>]' );
+
+		expect( defaultStyleCommand.value ).to.be.true;
+		expect( otherStyleCommand.value ).to.be.false;
+
+		otherStyleCommand.execute();
+
+		expect( getData( document ) ).to.equal( '[<image imageStyle="otherStyle"></image>]' );
+
+		defaultStyleCommand.execute();
+
+		expect( getData( document ) ).to.equal( '[<image></image>]' );
+		expect( defaultStyleCommand.value ).to.be.true;
+		expect( otherStyleCommand.value ).to.be.false;
+	} );
 } );