Ticket #8345: 8345.patch

_source/plugins/menu/plugin.js

@@ -112 +112 @@
                         {
                                 var selection = this.editor.getSelection();
 
-                                // Selection will be unavailable after menu shows up
-                                // in IE, lock it now.
-                                if ( CKEDITOR.env.ie )
-                                        selection && selection.lock();
-
                                 var element = selection && selection.getStartElement(),
                                         listeners = this._.listeners,
                                         includedItems = [];
@@ -175 +170 @@
 
                         onHide : function()
                         {
-                                if ( CKEDITOR.env.ie )
-                                {
-                                        var selection = this.editor.getSelection();
-                                        selection && selection.unlock();
-                                }
-
                                 this.onHide && this.onHide();
                         },
 

_source/plugins/dialog/plugin.js

@@ -974 +974 @@
 
                                 var editor = this._.editor;
                                 editor.focus();
-
-                                if ( editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
-                                {
-                                        var selection = editor.getSelection();
-                                        selection && selection.unlock( true );
-                                }
-                        }
+                        }
                         else
                                 CKEDITOR.dialog._.currentZIndex -= 10;
 
@@ -3096 +3090 @@
                          */
                         openDialog : function( dialogName, callback )
                         {
-                                if ( this.mode == 'wysiwyg' && CKEDITOR.env.ie )
-                                {
-                                        var selection = this.getSelection();
-                                        selection && selection.lock();
-                                }
-
                                 var dialogDefinitions = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
                                                 dialogSkin = this.skin.dialog;
 

_source/plugins/selection/plugin.js

@@ -241 +241 @@
                                 {
                                         var doc = editor.document,
                                                 body = doc.getBody(),
+                                                iframe = new CKEDITOR.dom.element( doc.getWindow().$.frameElement ),
                                                 html = doc.getDocumentElement();
 
                                         if ( CKEDITOR.env.ie )
@@ -249 +250 @@
                                                 // editor document loose the focus. In IE, we don't
                                                 // have support for it, so we reproduce it here, other
                                                 // than firing the selection change event.
+                                                var restoreSel = 0;
 
-                                                var savedRange,
-                                                        saveEnabled,
-                                                        restoreEnabled = 1;
-
                                                 // "onfocusin" is fired before "onfocus". It makes it
                                                 // possible to restore the selection before click
                                                 // events get executed.
                                                 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 )
-                                                                {
-                                                                        if ( restoreEnabled )
-                                                                        {
-                                                                                // Well not break because of this.
-                                                                                try
-                                                                                {
-                                                                                        savedRange.select();
-                                                                                }
-                                                                                catch (e)
-                                                                                {}
+                                                                var sel = editor.getSelection();
 
-                                                                                // Update locked selection because of the normalized text nodes. (#6083, #6987)
-                                                                                var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
-                                                                                if ( lockedSelection )
-                                                                                {
-                                                                                        lockedSelection.unlock();
-                                                                                        lockedSelection.lock();
-                                                                                }
-                                                                        }
-
-                                                                        savedRange = null;
-                                                                }
+                                                                // If we have a locked selection, restore it at this point.
+                                                                if ( sel.isLocked )
+                                                                {
+                                                                        sel.unlock( restoreSel );
+                                                                        restoreSel = 0;
+                                                                }
                                                         });
 
-                                                body.on( 'focus', function()
+                                                // Selection might lose at this point, or not (also triggered when clicking on scrollbar e.g.),
+                                                // but it's already the last chance for us to know the correct selection, so lock it up now.
+                                                iframe.on( 'beforedeactivate', function()
                                                         {
-                                                                // Enable selections to be saved.
-                                                                saveEnabled = 1;
+                                                                var doc = editor.document,
+                                                                        sel = editor.getSelection(),
+                                                                        nativeSel = sel && sel.getNative();
 
-                                                                saveSelection();
-                                                        });
+                                                                // There is a very specific case, when clicking
+                                                                // inside a text selection. In that case, the
+                                                                // selection collapses at the clicking point,
+                                                                // but the selection object remains in an
+                                                                // unknown state, making createRange return a
+                                                                // range at the very start of the document. In
+                                                                // such situation we have to test the range, to
+                                                                // be sure it's valid.
+                                                                if ( nativeSel && nativeSel.type == 'None' )
+                                                                {
+                                                                        // The "InsertImage" command can be used to
+                                                                        // test whether the selection is good or not.
+                                                                        // If not, it's enough to give some time to
+                                                                        // IE to put things in order for us.
+                                                                        if ( !doc.$.queryCommandEnabled( 'InsertImage' ) )
+                                                                        {
+                                                                                CKEDITOR.tools.setTimeout( arguments.callee, 50, this, true );
+                                                                                return;
+                                                                        }
+                                                                }
 
-                                                body.on( 'beforedeactivate', function( evt )
-                                                        {
-                                                                // 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 )
+                                                                // Avoid saving selection from within text input. (#5747)
+                                                                var parentTag;
+                                                                if ( nativeSel && nativeSel.type && nativeSel.type != 'Control'
+                                                                        && ( parentTag = nativeSel.createRange() )
+                                                                        && ( parentTag = parentTag.parentElement() )
+                                                                        && ( parentTag = parentTag.nodeName )
+                                                                        && parentTag.toLowerCase() in { input: 1, textarea : 1 } )
+                                                                {
                                                                         return;
+                                                                }
 
-                                                                // Disable selections from being saved.
-                                                                saveEnabled = 0;
-                                                                restoreEnabled = 1;
+                                                                sel.lock();
                                                         });
 
                                                 // IE before version 8 will leave cursor blinking inside the document after
@@ -326 +331 @@
                                                         });
                                                 }
 
-                                                // Listening on document element ensures that
-                                                // scrollbar is included. (#5280)
-                                                html.on( 'mousedown', function()
-                                                {
-                                                        // Lock restore selection now, as we have
-                                                        // a followed 'click' event which introduce
-                                                        // new selection. (#5735)
-                                                        restoreEnabled = 0;
-                                                });
+                                                // Now we're sure of the selection lost, mark it as to be restored.
+                                                editor.on( 'blur', function() { restoreSel = 1; } );
 
-                                                html.on( 'mouseup', function()
-                                                {
-                                                        restoreEnabled = 1;
-                                                });
-
                                                 // In IE6/7 the blinking cursor appears, but contents are
                                                 // not editable. (#5634)
                                                 if ( CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.version < 8 || CKEDITOR.env.quirks ) )
@@ -369 +362 @@
                                                                 if ( sel.type == 'None' )
                                                                         scroll = editor.window.getScrollPosition();
                                                         }
-                                                        disableSave();
                                                 });
 
                                                 body.on( 'mouseup',
@@ -382 +374 @@
                                                                         editor.document.$.documentElement.scrollTop = scroll.y;
                                                                 }
                                                                 scroll = null;
-
-                                                                saveEnabled = 1;
-                                                                setTimeout( function()
-                                                                        {
-                                                                                saveSelection( true );
-                                                                        },
-                                                                        0 );
                                                         });
 
-                                                body.on( 'keydown', disableSave );
-                                                body.on( 'keyup',
-                                                        function()
-                                                        {
-                                                                saveEnabled = 1;
-                                                                saveSelection();
-                                                        });
-
-
                                                 // IE is the only to provide the "selectionchange"
                                                 // event.
-                                                doc.on( 'selectionchange', saveSelection );
-
-                                                function disableSave()
-                                                {
-                                                        saveEnabled = 0;
-                                                }
-
-                                                function saveSelection( testIt )
-                                                {
-                                                        if ( saveEnabled )
-                                                        {
-                                                                var doc = editor.document,
-                                                                        sel = editor.getSelection(),
-                                                                        nativeSel = sel && sel.getNative();
-
-                                                                // There is a very specific case, when clicking
-                                                                // inside a text selection. In that case, the
-                                                                // selection collapses at the clicking point,
-                                                                // but the selection object remains in an
-                                                                // unknown state, making createRange return a
-                                                                // range at the very start of the document. In
-                                                                // such situation we have to test the range, to
-                                                                // be sure it's valid.
-                                                                if ( testIt && nativeSel && nativeSel.type == 'None' )
-                                                                {
-                                                                        // The "InsertImage" command can be used to
-                                                                        // test whether the selection is good or not.
-                                                                        // If not, it's enough to give some time to
-                                                                        // IE to put things in order for us.
-                                                                        if ( !doc.$.queryCommandEnabled( 'InsertImage' ) )
-                                                                        {
-                                                                                CKEDITOR.tools.setTimeout( saveSelection, 50, this, true );
-                                                                                return;
-                                                                        }
-                                                                }
-
-                                                                // Avoid saving selection from within text input. (#5747)
-                                                                var parentTag;
-                                                                if ( nativeSel && nativeSel.type && nativeSel.type != 'Control'
-                                                                        && ( parentTag = nativeSel.createRange() )
-                                                                        && ( parentTag = parentTag.parentElement() )
-                                                                        && ( parentTag = parentTag.nodeName )
-                                                                        && parentTag.toLowerCase() in { input: 1, textarea : 1 } )
-                                                                {
-                                                                        return;
-                                                                }
-
-                                                                savedRange = nativeSel && sel.getRanges()[ 0 ];
-
-                                                                checkSelectionChangeTimeout.call( editor );
-                                                        }
-                                                }
-                                        }
+                                                doc.on( 'selectionchange', checkSelectionChangeTimeout, editor );
+                                        }
                                         else
                                         {
                                                 // In other browsers, we make the selection change