Merge branch 'master' into t/ckeditor5/1404

ckeditor · Aug 13, 2019 · 2ce2a75 · 2ce2a75
2 parents 3167ec4 + 6c74d59
commit 2ce2a75
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/imagestyle/imagestyleediting.js b/src/imagestyle/imagestyleediting.js
@@ -16,7 +16,7 @@ import { normalizeImageStyles } from './utils';
  * The image style engine plugin. It sets the default configuration, creates converters and registers
  * {@link module:image/imagestyle/imagestylecommand~ImageStyleCommand ImageStyleCommand}.
  *
- * @extends {module:core/plugin~Plugin}
+ * @extends module:core/plugin~Plugin
  */
 export default class ImageStyleEditing extends Plugin {
 	/**

diff --git a/src/imagestyle/imagestyleui.js b/src/imagestyle/imagestyleui.js
@@ -85,7 +85,8 @@ export default class ImageStyleUI extends Plugin {
 			view.set( {
 				label: style.title,
 				icon: style.icon,
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isEnabled' ).to( command, 'isEnabled' );

diff --git a/tests/imagestyle/imagestyleui.js b/tests/imagestyle/imagestyleui.js
@@ -56,6 +56,7 @@ describe( 'ImageStyleUI', () => {
 			expect( buttonView ).to.be.instanceOf( ButtonView );
 			expect( buttonView.label ).to.equal( style.title );
 			expect( buttonView.icon ).to.equal( style.icon );
+			expect( buttonView.isToggleable ).to.be.true;
 
 			command.isEnabled = true;
 			expect( buttonView.isEnabled ).to.be.true;