vanilla ckeditor-3.6.2

[ckeditor.git] / _source / plugins / showborders / plugin.js

diff --git a/_source/plugins/showborders/plugin.js b/_source/plugins/showborders/plugin.js
index dc924e1..443a775 100644 (file)
--- a/_source/plugins/showborders/plugin.js
+++ b/_source/plugins/showborders/plugin.js
@@ -115,7 +115,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                        cssClass = attributes[ 'class' ],\r
                                                                        border = parseInt( attributes.border, 10 );\r
 \r
-                                                               if ( !border || border <= 0 )\r
+                                                               if ( ( !border || border <= 0 ) && ( !cssClass || cssClass.indexOf( showBorderClassName ) == -1 ) )\r
                                                                        attributes[ 'class' ] = ( cssClass || '' ) + ' ' + showBorderClassName;\r
                                                        }\r
                                                }\r