/*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
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