X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fstylescombo%2Fplugin.js;h=f3ebfd52db785c126bd1a88f17d8ae0500a3f51d;hb=refs%2Ftags%2Fv3.4.1;hp=8ed7f9b429dabef53f6d4ce025f83a5a57b8a590;hpb=e7789c1ad838194d45eeee6ac2eb6e55f5cf35a1;p=ckeditor.git

diff --git a/_source/plugins/stylescombo/plugin.js b/_source/plugins/stylescombo/plugin.js
index 8ed7f9b..f3ebfd5 100644
--- a/_source/plugins/stylescombo/plugin.js
+++ b/_source/plugins/stylescombo/plugin.js
@@ -34,6 +34,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 							style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
 							style._name = styleName;
+							style._.enterMode = config.enterMode;
 
 							stylesList.push( style );
 						}
@@ -107,6 +108,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 						if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )
 							style.remove( editor.document );
+						else if ( style.type == CKEDITOR.STYLE_OBJECT && style.checkActive( elementPath ) )
+							style.remove( editor.document );
 						else
 							style.apply( editor.document );