Ticket #3657: 3657_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -15 +15 @@
          */
         var nonExitableElementNames = { table:1,pre:1 };
 
+        /**
+         * IE has already preserved an editing position after table.
+         */
+        if( CKEDITOR.env.ie )
+                delete nonExitableElementNames.table;
+
         function onInsertHtml( evt )
         {
                 if ( this.mode == 'wysiwyg' )
@@ -108 +114 @@
         }
         
         /**
-         *  Auto-fixing block-less content by wrapping paragraph, prevent 
-         *  non-exitable-block by padding extra br.
+         *  Auto-fixing block-less content by wrapping paragraph (#3190), prevent
+         *  non-exitable-block by padding extra br.(#3189)
          */
         function onSelectionChangeFixBody( evt )
         {
                 var editor = evt.editor,
                         path = evt.data.path,
                         blockLimit = path.blockLimit,
+                        selection = evt.data.selection,
+                        selectedElement = selection.getSelectedElement(),
                         body = editor.document.getBody(),
                         enterMode = editor.config.enterMode;
 
-                // When enterMode set to block, we'll establing new paragraph if the
-                // current range is block-less within body.
+                // 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
                          && blockLimit.getName() == 'body'
-                         && !path.block )
+                         && !path.block
+                         && !( selectedElement && selectedElement.isBlockLike  && selectedElement.isBlockLike() ) )
                 {
                         var selection = evt.data.selection,
                                 range = evt.data.selection.getRanges()[0],