X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fbasicstyles%2Fplugin.js;h=b3f64fbbe754a76d86cea09336841214a4ca0678;hb=2f22c0c38f17e75be5541089076885442aaa2377;hp=5fbcd9a9d60c645d416ad59ccf289658682b853a;hpb=48b1db88210b4160dce439c6e3e32e14af8c106b;p=ckeditor.git

diff --git a/_source/plugins/basicstyles/plugin.js b/_source/plugins/basicstyles/plugin.js
index 5fbcd9a..b3f64fb 100644
--- a/_source/plugins/basicstyles/plugin.js
+++ b/_source/plugins/basicstyles/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
 */
 
@@ -17,7 +17,7 @@ CKEDITOR.plugins.add( 'basicstyles',
 
 			editor.attachStyleStateChange( style, function( state )
 				{
-					editor.getCommand( commandName ).setState( state );
+					!editor.readOnly && editor.getCommand( commandName ).setState( state );
 				});
 
 			editor.addCommand( commandName, new CKEDITOR.styleCommand( style ) );
@@ -44,58 +44,86 @@ CKEDITOR.plugins.add( 'basicstyles',
 // Basic Inline Styles.
 
 /**
- * The style definition to be used to apply the bold style in the text.
+ * The style definition that applies the <strong>bold</strong> style to the text.
  * @type Object
+ * @default <code>{ element : 'strong', overrides : 'b' }</code>
  * @example
  * config.coreStyles_bold = { element : 'b', overrides : 'strong' };
  * @example
- * config.coreStyles_bold = { element : 'span', attributes : {'class': 'Bold'} };
+ * config.coreStyles_bold =
+ *     {
+ *         element : 'span',
+ *         attributes : { 'class' : 'Bold' }
+ *     };
  */
 CKEDITOR.config.coreStyles_bold = { element : 'strong', overrides : 'b' };
 
 /**
- * The style definition to be used to apply the italic style in the text.
+ * The style definition that applies the <em>italics</em> style to the text.
  * @type Object
- * @default { element : 'em', overrides : 'i' }
+ * @default <code>{ element : 'em', overrides : 'i' }</code>
  * @example
  * config.coreStyles_italic = { element : 'i', overrides : 'em' };
  * @example
- * CKEDITOR.config.coreStyles_italic = { element : 'span', attributes : {'class': 'Italic'} };
+ * CKEDITOR.config.coreStyles_italic =
+ *     {
+ *         element : 'span',
+ *         attributes : { 'class' : 'Italic' }
+ *     };
  */
 CKEDITOR.config.coreStyles_italic = { element : 'em', overrides : 'i' };
 
 /**
- * The style definition to be used to apply the underline style in the text.
+ * The style definition that applies the <u>underline</u> style to the text.
  * @type Object
- * @default { element : 'u' }
+ * @default <code>{ element : 'u' }</code>
  * @example
- * CKEDITOR.config.coreStyles_underline = { element : 'span', attributes : {'class': 'Underline'}};
+ * CKEDITOR.config.coreStyles_underline =
+ *     {
+ *         element : 'span',
+ *         attributes : { 'class' : 'Underline' }
+ *     };
  */
 CKEDITOR.config.coreStyles_underline = { element : 'u' };
 
 /**
- * The style definition to be used to apply the strike style in the text.
+ * The style definition that applies the <strike>strike-through</strike> style to the text.
  * @type Object
- * @default { element : 'strike' }
+ * @default <code>{ element : 'strike' }</code>
  * @example
- * CKEDITOR.config.coreStyles_strike = { element : 'span', attributes : {'class': 'StrikeThrough'}, overrides : 'strike' };
+ * CKEDITOR.config.coreStyles_strike =
+ *     {
+ *         element : 'span',
+ *         attributes : { 'class' : 'StrikeThrough' },
+ *         overrides : 'strike'
+ *     };
  */
 CKEDITOR.config.coreStyles_strike = { element : 'strike' };
 
 /**
- * The style definition to be used to apply the subscript style in the text.
+ * The style definition that applies the subscript style to the text.
  * @type Object
- * @default { element : 'sub' }
+ * @default <code>{ element : 'sub' }</code>
  * @example
- * CKEDITOR.config.coreStyles_subscript = { element : 'span', attributes : {'class': 'Subscript'}, overrides : 'sub' };
+ * CKEDITOR.config.coreStyles_subscript =
+ *     {
+ *         element : 'span',
+ *         attributes : { 'class' : 'Subscript' },
+ *         overrides : 'sub'
+ *     };
  */
 CKEDITOR.config.coreStyles_subscript = { element : 'sub' };
 
 /**
- * The style definition to be used to apply the superscript style in the text.
+ * The style definition that applies the superscript style to the text.
  * @type Object
- * @default { element : 'sup' }
+ * @default <code>{ element : 'sup' }</code>
  * @example
- * CKEDITOR.config.coreStyles_superscript = { element : 'span', attributes : {'class': 'Superscript'}, overrides : 'sup' };
+ * CKEDITOR.config.coreStyles_superscript =
+ *     {
+ *         element : 'span',
+ *         attributes : { 'class' : 'Superscript' },
+ *         overrides : 'sup'
+ *     };
  */
 CKEDITOR.config.coreStyles_superscript = { element : 'sup' };