Ticket #5782: 5782.patch

_source/plugins/wysiwygarea/plugin.js

@@ -492 +492 @@
                                                 domWindow.on( 'focus', function()
                                                         {
                                                                 var doc = editor.document;
-                                                                if ( CKEDITOR.env.gecko || CKEDITOR.env.opera )
+
+                                                                if ( CKEDITOR.env.gecko )
+                                                                        blinkCursor();
+                                                                else if ( CKEDITOR.env.opera )
                                                                         doc.getBody().focus();
                                                                 else if ( CKEDITOR.env.webkit )
                                                                 {
@@ -821 +824 @@
                         // Switch on design mode for a short while and close it after then.
                         function blinkCursor()
                         {
-                                editor.document.$.designMode = 'on';
-                                setTimeout( function ()
-                                {
-                                        editor.document.$.designMode = 'off';
-                                }, 50 );
+                                CKEDITOR.tools.tryThese( function ()
+                                {
+                                        editor.document.$.designMode = 'on';
+                                        setTimeout( function ()
+                                        {
+                                                editor.document.$.designMode = 'off';
+                                                editor.document.getBody().focus();
+                                        }, 50 );
+                                }, function ()
+                                {
+                                        // Refresh 'contentEditable' when parent DOM
+                                        // tree layout changes may break design mode. (#5782)
+                                        editor.document.$.designMode = 'off';
+                                        var body = editor.document.getBody();
+                                        body.setAttribute( 'contentEditable', false );
+                                        body.setAttribute( 'contentEditable', true );
+                                        blinkCursor();
+                                })
                         }
 
                         // Create an invisible element to grab focus.