Changeset 5286

Timestamp:

03/24/10 17:21:21 (3 years ago)

Author:

garry.yao

Message:

#5302: Adding config option 'CKEDITOR.config.forceEnterMode'.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/core/config.js (modified) (2 diffs)
• _source/plugins/enterkey/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -47 +47 @@
                                         Now the configuration entry is named 'config.stylesSet' instead of config.stylesCombo_stylesSet and the default location 
                                         is under the 'styles' plugin instead of 'stylescombo'.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/5302">#5302</a> : Adding config option 'CKEDITOR.config.forceEnterMode'.</li>
         </ul>
         <p>

CKEditor/trunk/_source/core/config.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -131 +131 @@
 
         /**
+         * 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

CKEditor/trunk/_source/plugins/enterkey/plugin.js

@@ -292 +292 @@
         function enter( editor, mode, forceMode )
         {
+                forceMode = editor.config.forceEnterMode || forceMode;
+
                 // Only effective within document.
                 if ( editor.mode != 'wysiwyg' )