vanilla ckeditor-3.3

[ckeditor.git] / _source / core / config.js

diff --git a/_source/core/config.js b/_source/core/config.js
index d83e0e3..f3938d8 100644 (file)
--- a/_source/core/config.js
+++ b/_source/core/config.js
@@ -76,14 +76,28 @@ CKEDITOR.config =
 \r
        /**\r
         * The writting direction of the language used to write the editor\r
-        * contents. Allowed values are 'ltr' for Left-To-Right language (like\r
-        * English), or 'rtl' for Right-To-Left languages (like Arabic).\r
-        * @default 'ltr'\r
+        * contents. Allowed values are:\r
+        * <ul>\r
+        *     <li>'ui' - which indicate content direction will be the same with the user interface language direction;</li>\r
+        *     <li>'ltr' - for Left-To-Right language (like English);</li>\r
+        *     <li>'rtl' - for Right-To-Left languages (like Arabic).</li>\r
+        * </ul>\r
+        * @default 'ui'\r
         * @type String\r
         * @example\r
         * config.contentsLangDirection = 'rtl';\r
         */\r
-       contentsLangDirection : 'ltr',\r
+       contentsLangDirection : 'ui',\r
+\r
+       /**\r
+        * Language code of  the writting language which is used to author the editor\r
+        * contents.\r
+        * @default Same value with editor's UI language.\r
+        * @type String\r
+        * @example\r
+        * config.contentsLanguage = 'fr';\r
+        */\r
+       contentsLanguage : '',\r
 \r
        /**\r
         * The user interface language localization to use. If empty, the editor\r
@@ -130,6 +144,18 @@ CKEDITOR.config =
        enterMode : CKEDITOR.ENTER_P,\r
 \r
        /**\r
+        * Force the respect of {@link CKEDITOR.config.enterMode} as line break regardless of the context,\r
+        * E.g. If {@link CKEDITOR.config.enterMode} is set to {@link CKEDITOR.ENTER_P},\r
+        * press enter key inside a 'div' will create a new paragraph with 'p' instead of 'div'.\r
+        * @since 3.2.1\r
+        * @default false\r
+        * @example\r
+        * // Not recommended.\r
+        * config.forceEnterMode = true;\r
+        */\r
+       forceEnterMode : false,\r
+\r
+       /**\r
         * Just like the {@link CKEDITOR.config.enterMode} setting, it defines the behavior for the SHIFT+ENTER key.\r
         * The allowed values are the following constants, and their relative\r
         * behavior:\r
@@ -217,7 +243,7 @@ CKEDITOR.config =
         * @type String\r
         * @example\r
         */\r
-       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,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',\r
+       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',\r
 \r
        /**\r
         * List of additional plugins to be loaded. This is a tool setting which\r