Ticket #6654: 6654_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -381 +381 @@
                         }
                 }
 
-                // When enterMode set to block, we'll establing new paragraph only if we're
-                // selecting inline contents right under body. (#3657)
-                if ( enterMode != CKEDITOR.ENTER_BR
-                     && range.collapsed
-                         && blockLimit.getName() == 'body'
-                         && !path.block )
+                // When we're in block enter mode, a new paragraph will be established
+                // to encapsulate inline contents right under body. (#3657)
+                if ( editor.config.autoParagraph !== false
+                                && enterMode != CKEDITOR.ENTER_BR
+                                && range.collapsed
+                                && blockLimit.getName() == 'body'
+                                && !path.block )
                 {
                         editor.fire( 'updateSnapshot' );
                         restoreDirty( editor );
@@ -1306 +1307 @@
  */
 
 /**
+ * Whether automatically create wrapping blocks around inline contents inside document body,
+ * this helps to ensure the integrality of the block enter mode.
+ * <strong>Note:</strong> Changing the default value might introduce unpredictable usability issues.
+ * @since 3.6
+ * @type Boolean
+ * @default true
+ * @example
+ * config.autoParagraph = false;
+ */
+
+/**
  * Fired when some elements are added to the document
  * @name CKEDITOR.editor#ariaWidget
  * @event