Ticket #4666: 4666.patch

_source/plugins/selection/plugin.js

@@ -115 +115 @@
                                                 // than firing the selection change event.
 
                                                 var savedRange,
-                                                        saveEnabled;
+                                                        saveEnabled,
+                                                        // Use a light-grey style to mark blurred selection which mimics Firefox and Webkit. 
+                                                        highlightStyle = new CKEDITOR.style( { element : 'span', attributes : { 'class' : 'cke_range_mark' } } );
 
                                                 // "onfocusin" is fired before "onfocus". It makes it
                                                 // possible to restore the selection before click
                                                 // events get executed.
                                                 body.on( 'focusin', function( evt )
                                                         {
+                                                                body.removeClass( 'deactivate' );
                                                                 // 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' )
@@ -139 +142 @@
                                                                         catch (e)
                                                                         {}
 
+                                                                        // Defers until user selection actually happens inside document, e.g. click.
+                                                                        setTimeout( function ()
+                                                                        {
+                                                                                var sel = editor.getSelection(),
+                                                                                                bm = sel.createBookmarks();
+                                                                                var docRange = new CKEDITOR.dom.range( doc );
+                                                                                docRange.selectNodeContents( doc.getBody() );
+                                                                                highlightStyle.removeFromRange( docRange );
+                                                                                sel.selectBookmarks( bm );
+                                                                        }, 100 );
+
                                                                         savedRange = null;
                                                                 }
                                                         });
@@ -153 +167 @@
 
                                                 body.on( 'beforedeactivate', function( evt )
                                                         {
+                                                                body.addClass( 'deactivate' );
+
                                                                 // Ignore this event if it's caused by focus switch between
                                                                 // internal editable control type elements, e.g. layouted paragraph. (#4682)
                                                                 if ( evt.data.$.toElement )
                                                                         return;
 
+                                                                var sel = editor.getSelection();
+                                                                var isLocked = sel.isLocked;
+
+                                                                isLocked && sel.unlock();
+                                                                sel.isLocked && sel.unlock();
+                                                                highlightStyle.apply( doc );
+                                                                isLocked && sel.lock();
+
+                                                                // Save may already get disabled, e.g. 'tab' key down,
+                                                                // open it for the last save.
+                                                                saveEnabled = true;
+                                                                saveSelection();
                                                                 // Disable selections from being saved.
                                                                 saveEnabled = false;
                                                         });
@@ -257 +285 @@
                                 });
 
                         editor.selectionChange = checkSelectionChangeTimeout;
-                }
-        });
+
+                        if ( CKEDITOR.env.ie )
+                        {
+                                editor.addCss(
+                                        'body.deactivate span.cke_range_mark' +
+                                        '{' +
+                                                'background-color: #ADAAAB;' +
+                                                'color: #fff;'  +
+                                        '}' );
+                        }
+                },
+
+                afterInit : function( editor )
+                {
+                        if ( !CKEDITOR.env.ie )
+                                return;
+
+                        var dataProcessor = editor.dataProcessor,
+                                htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+                        if ( htmlFilter )
+                        {
+                                htmlFilter.addRules(
+                                        {
+                                                elements :
+                                                {
+                                                        'span' : function( element )
+                                                        {
+                                                                if ( element.attributes[ 'class' ] == 'cke_range_mark' )
+                                                                        delete element. name;
+
+                                                                return element;
+                                                        }
+                                                }
+                                        });
+                        }
+                }
+        });
 
         /**
          * Gets the current selection from the editing area when in WYSIWYG mode.