X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fcore%2Fconfig.js;h=8d45ebed27d480aaea4603316a7d797f6d139dfa;hb=refs%2Ftags%2Fv3.5.3;hp=f18c50b504cc278af9116ccce33b7f4e992af602;hpb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7;p=ckeditor.git
diff --git a/_source/core/config.js b/_source/core/config.js
index f18c50b..8d45ebe 100644
--- a/_source/core/config.js
+++ b/_source/core/config.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
*/
@@ -8,19 +8,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
* default configuration settings.
*/
+/**
+ * Used in conjuction with {@link CKEDITOR.config.enterMode} and
+ * {@link CKEDITOR.config.shiftEnterMode} to make the editor produce <p>
+ * tags when using the ENTER key.
+ * @constant
+ */
CKEDITOR.ENTER_P = 1;
+
+/**
+ * Used in conjuction with {@link CKEDITOR.config.enterMode} and
+ * {@link CKEDITOR.config.shiftEnterMode} to make the editor produce <br>
+ * tags when using the ENTER key.
+ * @constant
+ */
CKEDITOR.ENTER_BR = 2;
+
+/**
+ * Used in conjuction with {@link CKEDITOR.config.enterMode} and
+ * {@link CKEDITOR.config.shiftEnterMode} to make the editor produce <div>
+ * tags when using the ENTER key.
+ * @constant
+ */
CKEDITOR.ENTER_DIV = 3;
/**
- * Holds the default configuration settings. Changes to this object are
+ * @namespace Holds the default configuration settings. Changes to this object are
* reflected in all editor instances, if not specificaly specified for those
* instances.
- * @namespace
- * @example
- * // All editor created after the following setting will not load custom
- * // configuration files.
- * CKEDITOR.config.customConfig = '';
*/
CKEDITOR.config =
{
@@ -56,7 +71,7 @@ CKEDITOR.config =
* The base href URL used to resolve relative and absolute URLs in the
* editor content.
* @type String
- * @default '' (empty string)
+ * @default '' (empty)
* @example
* config.baseHref = 'http://www.example.com/path/';
*/
@@ -194,19 +209,29 @@ CKEDITOR.config =
/**
* Sets the "id" attribute to be used on the body element of the editing
- * area.
+ * area. This can be useful when reusing the original CSS file you're using
+ * on your live website and you want to assing to the editor the same id
+ * you're using for the region that'll hold the contents. In this way,
+ * id specific CSS rules will be enabled.
* @since 3.1
* @type String
- * @default ''
+ * @default '' (empty)
+ * @example
+ * config.bodyId = 'contents_id';
*/
bodyId : '',
/**
* Sets the "class" attribute to be used on the body element of the editing
- * area.
+ * area. This can be useful when reusing the original CSS file you're using
+ * on your live website and you want to assing to the editor the same class
+ * name you're using for the region that'll hold the contents. In this way,
+ * class specific CSS rules will be enabled.
* @since 3.1
* @type String
- * @default ''
+ * @default '' (empty)
+ * @example
+ * config.bodyClass = 'contents';
*/
bodyClass : '',
@@ -267,6 +292,7 @@ CKEDITOR.config =
'forms,' +
'horizontalrule,' +
'htmldataprocessor,' +
+ 'iframe,' +
'image,' +
'indent,' +
'justify,' +
@@ -324,7 +350,7 @@ CKEDITOR.config =
/**
* List of regular expressions to be executed over the input HTML,
- * indicating code that must stay untouched.
+ * indicating HTML source code that matched must not present in WYSIWYG mode for editing.
* @type Array
* @default [] (empty array)
* @example
@@ -387,10 +413,10 @@ CKEDITOR.config =
};
/**
- * Indicates that some of the editor features, like alignement and text
+ * Indicates that some of the editor features, like alignment and text
* direction, should used the "computed value" of the feature to indicate it's
- * on/off state, instead of using the "real value".
- *
+ * on/off state, instead of using the "real value".
+ *
* If enabled, in a left to right written document, the "Left Justify"
* alignment button will show as active, even if the aligment style is not
* explicitly applied to the current paragraph in the editor.