X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fcore%2Fconfig.js;h=8d45ebed27d480aaea4603316a7d797f6d139dfa;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=f3938d8966e601e422504ccbbd2de18a140dac8c;hpb=f8fc585c18d287eb325c575596d183122486b641;p=ckeditor.git
diff --git a/_source/core/config.js b/_source/core/config.js
index f3938d8..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 : '',
@@ -243,7 +268,64 @@ CKEDITOR.config =
* @type String
* @example
*/
- plugins : 'about,a11yhelp,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,liststyle,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+ plugins :
+ 'about,' +
+ 'a11yhelp,' +
+ 'basicstyles,' +
+ 'bidi,' +
+ 'blockquote,' +
+ 'button,' +
+ 'clipboard,' +
+ 'colorbutton,' +
+ 'colordialog,' +
+ 'contextmenu,' +
+ 'dialogadvtab,' +
+ 'div,' +
+ 'elementspath,' +
+ 'enterkey,' +
+ 'entities,' +
+ 'filebrowser,' +
+ 'find,' +
+ 'flash,' +
+ 'font,' +
+ 'format,' +
+ 'forms,' +
+ 'horizontalrule,' +
+ 'htmldataprocessor,' +
+ 'iframe,' +
+ 'image,' +
+ 'indent,' +
+ 'justify,' +
+ 'keystrokes,' +
+ 'link,' +
+ 'list,' +
+ 'liststyle,' +
+ 'maximize,' +
+ 'newpage,' +
+ 'pagebreak,' +
+ 'pastefromword,' +
+ 'pastetext,' +
+ 'popup,' +
+ 'preview,' +
+ 'print,' +
+ 'removeformat,' +
+ 'resize,' +
+ 'save,' +
+ 'scayt,' +
+ 'smiley,' +
+ 'showblocks,' +
+ 'showborders,' +
+ 'sourcearea,' +
+ 'stylescombo,' +
+ 'table,' +
+ 'tabletools,' +
+ 'specialchar,' +
+ 'tab,' +
+ 'templates,' +
+ 'toolbar,' +
+ 'undo,' +
+ 'wysiwygarea,' +
+ 'wsc',
/**
* List of additional plugins to be loaded. This is a tool setting which
@@ -268,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
@@ -330,4 +412,20 @@ CKEDITOR.config =
baseFloatZIndex : 10000
};
+/**
+ * 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".
+ *
+ * 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.
+ * @name CKEDITOR.config.useComputedState
+ * @type Boolean
+ * @default true
+ * @since 3.4
+ * @example
+ * config.useComputedState = false;
+ */
+
// PACKAGER_RENAME( CKEDITOR.config )