X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fshowborders%2Fplugin.js;h=846a12b6460866267279335a3fa51592d77efae3;hb=2f22c0c38f17e75be5541089076885442aaa2377;hp=06036777b2da5f45994c98c65f562d1f105d9117;hpb=4e70ea24db840898be8cc21c950363a52a2a6aba;p=ckeditor.git

diff --git a/_source/plugins/showborders/plugin.js b/_source/plugins/showborders/plugin.js
index 0603677..846a12b 100644
--- a/_source/plugins/showborders/plugin.js
+++ b/_source/plugins/showborders/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -18,7 +18,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		( CKEDITOR.env.ie6Compat ?
 		  [
 			'.%1 table.%2,',
-			 '.%1 table.%2 td, .%1 table.%2 th,',
+			 '.%1 table.%2 td, .%1 table.%2 th',
 			 '{',
 				'border : #d3d3d3 1px dotted',
 			 '}'
@@ -115,7 +115,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									cssClass = attributes[ 'class' ],
 									border = parseInt( attributes.border, 10 );
 
-								if ( !border || border <= 0 )
+								if ( ( !border || border <= 0 ) && ( !cssClass || cssClass.indexOf( showBorderClassName ) == -1 ) )
 									attributes[ 'class' ] = ( cssClass || '' ) + ' ' + showBorderClassName;
 							}
 						}