X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fbasicstyles%2Fplugin.js;h=5e928e169ae820af117eaac698604d81c45c9136;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=8bcd1e4c9320f5a5de5e64c6e35fbe5871ac3db5;hpb=e7789c1ad838194d45eeee6ac2eb6e55f5cf35a1;p=ckeditor.git

diff --git a/_source/plugins/basicstyles/plugin.js b/_source/plugins/basicstyles/plugin.js
index 8bcd1e4..5e928e1 100644
--- a/_source/plugins/basicstyles/plugin.js
+++ b/_source/plugins/basicstyles/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, 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 ) );
@@ -29,73 +29,101 @@ CKEDITOR.plugins.add( 'basicstyles',
 				});
 		};
 
-		var config = editor.config;
-		var lang = editor.lang;
+		var config = editor.config,
+			lang = editor.lang;
 
-		addButtonCommand( 'Bold'		, lang.bold			, 'bold'		, config.coreStyles_bold );
+		addButtonCommand( 'Bold'		, lang.bold		, 'bold'		, config.coreStyles_bold );
 		addButtonCommand( 'Italic'		, lang.italic		, 'italic'		, config.coreStyles_italic );
-		addButtonCommand( 'Underline'	, lang.underline	, 'underline'	, config.coreStyles_underline );
+		addButtonCommand( 'Underline'	, lang.underline		, 'underline'	, config.coreStyles_underline );
 		addButtonCommand( 'Strike'		, lang.strike		, 'strike'		, config.coreStyles_strike );
-		addButtonCommand( 'Subscript'	, lang.subscript	, 'subscript'	, config.coreStyles_subscript );
-		addButtonCommand( 'Superscript'	, lang.superscript	, 'superscript'	, config.coreStyles_superscript );
+		addButtonCommand( 'Subscript'	, lang.subscript		, 'subscript'	, config.coreStyles_subscript );
+		addButtonCommand( 'Superscript'	, lang.superscript		, 'superscript'	, config.coreStyles_superscript );
 	}
 });
 
 // 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_bold = { element : 'i', overrides : 'em' };
+ * 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' };