X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fconfig.js;h=f3938d8966e601e422504ccbbd2de18a140dac8c;hb=f8fc585c18d287eb325c575596d183122486b641;hp=a51f938bf9a4757e7409518ade143717bfe80f93;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git
diff --git a/_source/core/config.js b/_source/core/config.js
index a51f938..f3938d8 100644
--- a/_source/core/config.js
+++ b/_source/core/config.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -40,7 +40,7 @@ CKEDITOR.config =
* // Do not load any custom configuration file.
* CKEDITOR.replace( 'myfiled', { customConfig : '' } );
*/
- customConfig : CKEDITOR.getUrl( 'config.js' ),
+ customConfig : 'config.js',
/**
* Whether the replaced element (usually a textarea) is to be updated
@@ -76,21 +76,35 @@ CKEDITOR.config =
/**
* The writting direction of the language used to write the editor
- * contents. Allowed values are 'ltr' for Left-To-Right language (like
- * English), or 'rtl' for Right-To-Left languages (like Arabic).
- * @default 'ltr'
+ * contents. Allowed values are:
+ *
+ * - 'ui' - which indicate content direction will be the same with the user interface language direction;
+ * - 'ltr' - for Left-To-Right language (like English);
+ * - 'rtl' - for Right-To-Left languages (like Arabic).
+ *
+ * @default 'ui'
* @type String
* @example
* config.contentsLangDirection = 'rtl';
*/
- contentsLangDirection : 'ltr',
+ contentsLangDirection : 'ui',
+
+ /**
+ * Language code of the writting language which is used to author the editor
+ * contents.
+ * @default Same value with editor's UI language.
+ * @type String
+ * @example
+ * config.contentsLanguage = 'fr';
+ */
+ contentsLanguage : '',
/**
* The user interface language localization to use. If empty, the editor
* automatically localize the editor to the user language, if supported,
* otherwise the {@link CKEDITOR.config.defaultLanguage} language is used.
- * @default true
- * @type Boolean
+ * @default '' (empty)
+ * @type String
* @example
* // Load the German interface.
* config.language = 'de';
@@ -130,6 +144,18 @@ CKEDITOR.config =
enterMode : CKEDITOR.ENTER_P,
/**
+ * Force the respect of {@link CKEDITOR.config.enterMode} as line break regardless of the context,
+ * E.g. If {@link CKEDITOR.config.enterMode} is set to {@link CKEDITOR.ENTER_P},
+ * press enter key inside a 'div' will create a new paragraph with 'p' instead of 'div'.
+ * @since 3.2.1
+ * @default false
+ * @example
+ * // Not recommended.
+ * config.forceEnterMode = true;
+ */
+ forceEnterMode : false,
+
+ /**
* Just like the {@link CKEDITOR.config.enterMode} setting, it defines the behavior for the SHIFT+ENTER key.
* The allowed values are the following constants, and their relative
* behavior:
@@ -167,10 +193,29 @@ CKEDITOR.config =
docType : '',
/**
+ * Sets the "id" attribute to be used on the body element of the editing
+ * area.
+ * @since 3.1
+ * @type String
+ * @default ''
+ */
+ bodyId : '',
+
+ /**
+ * Sets the "class" attribute to be used on the body element of the editing
+ * area.
+ * @since 3.1
+ * @type String
+ * @default ''
+ */
+ bodyClass : '',
+
+ /**
* Indicates whether the contents to be edited are being inputted as a full
* HTML page. A full page includes the <html>, <head> and
* <body> tags. The final output will also reflect this setting,
* including the <body> contents only if this setting is disabled.
+ * @since 3.1
* @type Boolean
* @default false
* @example
@@ -198,7 +243,7 @@ CKEDITOR.config =
* @type String
* @example
*/
- plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+ 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',
/**
* List of additional plugins to be loaded. This is a tool setting which
@@ -283,7 +328,6 @@ CKEDITOR.config =
* config.baseFloatZIndex = 2000
*/
baseFloatZIndex : 10000
-
};
// PACKAGER_RENAME( CKEDITOR.config )