X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fcore%2Fconfig.js;h=962f33b2230e796a4b9cf0cf9304c82146ec38ce;hp=db77f764e5232869851dc934f5b55d78cfc71418;hb=2f22c0c38f17e75be5541089076885442aaa2377;hpb=e73319a12b56100b29ef456fd74114fe5519e01c diff --git a/_source/core/config.js b/_source/core/config.js index db77f76..962f33b 100644 --- a/_source/core/config.js +++ b/_source/core/config.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 */ @@ -256,15 +256,18 @@ CKEDITOR.config = fullPage : false, /** - * The height of the editing area (that includes the editor content), - * in relative or absolute units, e.g. 30px, 5em. - * Note: Percentage units, like 30%, are not supported yet. + * The height of the editing area (that includes the editor content). This + * can be an integer, for pixel sizes, or any CSS-defined length unit.
+ *
+ * Note: Percent units (%) are not supported. * @type Number|String - * @default '200' + * @default 200 * @example - * config.height = 500; - * config.height = '25em'; - * config.height = '300px'; + * config.height = 500; // 500 pixels. + * @example + * config.height = '25em'; // CSS length. + * @example + * config.height = '300px'; // CSS length. */ height : 200, @@ -400,13 +403,18 @@ CKEDITOR.config = skin : 'kama', /** - * The editor width in CSS-defined units or an integer denoting a value in pixels. + * The editor UI outer width. This can be an integer, for pixel sizes, or + * any CSS-defined unit.
+ *
+ * Unlike the {@link CKEDITOR.config.height} setting, this + * one will set the outer width of the entire editor UI, not for the + * editing area only. * @type String|Number * @default '' (empty) * @example - * config.width = 850; + * config.width = 850; // 850 pixels wide. * @example - * config.width = '75%'; + * config.width = '75%'; // CSS unit. */ width : '',