X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fformat%2Fplugin.js;h=6c4faf6f3ed748a4f9848232af55c83be69b6c1d;hp=bb0d997f75d63b7b476f6a7ae4b5ea8c78487335;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hpb=9afde8772159bd3436f1f5b7862960307710ae5a

diff --git a/_source/plugins/format/plugin.js b/_source/plugins/format/plugin.js
index bb0d997..6c4faf6 100644
--- a/_source/plugins/format/plugin.js
+++ b/_source/plugins/format/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -54,7 +54,10 @@ CKEDITOR.plugins.add( 'format',
 					editor.focus();
 					editor.fire( 'saveSnapshot' );
 
-					styles[ value ].apply( editor.document );
+					var style = styles[ value ],
+						elementPath = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() );
+
+					style[ style.checkActive( elementPath ) ? 'remove' : 'apply' ]( editor.document );
 
 					// Save the undo snapshot after all changes are affected. (#4899)
 					setTimeout( function()
@@ -108,7 +111,7 @@ CKEDITOR.config.format_tags = 'p;h1;h2;h3;h4;h5;h6;pre;address;div';
  * @type Object
  * @default { element : 'p' }
  * @example
- * config.format_p = { element : 'p', attributes : { class : 'normalPara' } };
+ * config.format_p = { element : 'p', attributes : { 'class' : 'normalPara' } };
  */
 CKEDITOR.config.format_p = { element : 'p' };
 
@@ -117,7 +120,7 @@ CKEDITOR.config.format_p = { element : 'p' };
  * @type Object
  * @default { element : 'div' }
  * @example
- * config.format_div = { element : 'div', attributes : { class : 'normalDiv' } };
+ * config.format_div = { element : 'div', attributes : { 'class' : 'normalDiv' } };
  */
 CKEDITOR.config.format_div = { element : 'div' };
 
@@ -126,7 +129,7 @@ CKEDITOR.config.format_div = { element : 'div' };
  * @type Object
  * @default { element : 'pre' }
  * @example
- * config.format_pre = { element : 'pre', attributes : { class : 'code' } };
+ * config.format_pre = { element : 'pre', attributes : { 'class' : 'code' } };
  */
 CKEDITOR.config.format_pre = { element : 'pre' };
 
@@ -135,7 +138,7 @@ CKEDITOR.config.format_pre = { element : 'pre' };
  * @type Object
  * @default { element : 'address' }
  * @example
- * config.format_address = { element : 'address', attributes : { class : 'styledAddress' } };
+ * config.format_address = { element : 'address', attributes : { 'class' : 'styledAddress' } };
  */
 CKEDITOR.config.format_address = { element : 'address' };
 
@@ -144,7 +147,7 @@ CKEDITOR.config.format_address = { element : 'address' };
  * @type Object
  * @default { element : 'h1' }
  * @example
- * config.format_h1 = { element : 'h1', attributes : { class : 'contentTitle1' } };
+ * config.format_h1 = { element : 'h1', attributes : { 'class' : 'contentTitle1' } };
  */
 CKEDITOR.config.format_h1 = { element : 'h1' };
 
@@ -153,7 +156,7 @@ CKEDITOR.config.format_h1 = { element : 'h1' };
  * @type Object
  * @default { element : 'h2' }
  * @example
- * config.format_h2 = { element : 'h2', attributes : { class : 'contentTitle2' } };
+ * config.format_h2 = { element : 'h2', attributes : { 'class' : 'contentTitle2' } };
  */
 CKEDITOR.config.format_h2 = { element : 'h2' };
 
@@ -162,7 +165,7 @@ CKEDITOR.config.format_h2 = { element : 'h2' };
  * @type Object
  * @default { element : 'h3' }
  * @example
- * config.format_h3 = { element : 'h3', attributes : { class : 'contentTitle3' } };
+ * config.format_h3 = { element : 'h3', attributes : { 'class' : 'contentTitle3' } };
  */
 CKEDITOR.config.format_h3 = { element : 'h3' };
 
@@ -171,7 +174,7 @@ CKEDITOR.config.format_h3 = { element : 'h3' };
  * @type Object
  * @default { element : 'h4' }
  * @example
- * config.format_h4 = { element : 'h4', attributes : { class : 'contentTitle4' } };
+ * config.format_h4 = { element : 'h4', attributes : { 'class' : 'contentTitle4' } };
  */
 CKEDITOR.config.format_h4 = { element : 'h4' };
 
@@ -180,7 +183,7 @@ CKEDITOR.config.format_h4 = { element : 'h4' };
  * @type Object
  * @default { element : 'h5' }
  * @example
- * config.format_h5 = { element : 'h5', attributes : { class : 'contentTitle5' } };
+ * config.format_h5 = { element : 'h5', attributes : { 'class' : 'contentTitle5' } };
  */
 CKEDITOR.config.format_h5 = { element : 'h5' };
 
@@ -189,6 +192,6 @@ CKEDITOR.config.format_h5 = { element : 'h5' };
  * @type Object
  * @default { element : 'h6' }
  * @example
- * config.format_h6 = { element : 'h6', attributes : { class : 'contentTitle6' } };
+ * config.format_h6 = { element : 'h6', attributes : { 'class' : 'contentTitle6' } };
  */
 CKEDITOR.config.format_h6 = { element : 'h6' };