Ticket #4682: 4682_2.patch

_source/plugins/selection/plugin.js

@@ -108 +108 @@
                                                 // "onfocusin" is fired before "onfocus". It makes it
                                                 // possible to restore the selection before click
                                                 // events get executed.
-                                                body.on( 'focusin', function()
+                                                body.on( 'focusin', function(evt)
                                                         {
+                                                                // If there are elements with layout they fire this event but
+                                                                // it must be ignored to allow edit its contents #4682
+                                                                if ( evt.data.$.srcElement.nodeName !== 'BODY' )
+                                                                        return;
+
                                                                 // If we have saved a range, restore it at this
                                                                 // point.
                                                                 if ( savedRange )
@@ -134 +139 @@
                                                                 saveSelection();
                                                         });
 
-                                                body.on( 'beforedeactivate', function()
+                                                body.on( 'beforedeactivate', function( evt )
                                                         {
+                                                                // Ignore this event if it's caused by focus swtich between
+                                                                // internal editable control type elements, e.g. layouted paragraph. (#4682)
+                                                                if ( evt.data.$.toElement )
+                                                                        return;
+
                                                                 // Disable selections from being saved.
                                                                 saveEnabled = false;
+
+                                                                // IE before version 8 will leave cursor blinking inside the document after
+                                                                // editor blurred unless we clean up the selection. (#4716)
+                                                                if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )
+                                                                {
+                                                                        // IE stack overflows when we're doing so inside table. (#5114)
+                                                                        // or an element with layout #4682
+                                                                        var parent =
+                                                                                savedRange
+                                                                                && savedRange.parentElement
+                                                                                && savedRange.parentElement();
+
+                                                                        if ( savedRange && !( parent && (parent.tagName.toLowerCase( ) in CKEDITOR.dtd.$tableContent || parent.currentStyle.hasLayout) ) )
+                                                                                editor.document.$.selection.empty();
+                                                                }
                                                         });
 
                                                 // IE fires the "selectionchange" event when clicking