Ticket #8345: 8345_2.patch

_source/plugins/selection/plugin.js

@@ -291 +291 @@
                                                                 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)
-                                                                                {}
-
-                                                                                // Update locked selection because of the normalized text nodes. (#6083, #6987)
-                                                                                var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
-                                                                                if ( lockedSelection )
-                                                                                {
-                                                                                        lockedSelection.unlock();
-                                                                                        lockedSelection.lock();
-                                                                                }
-                                                                        }
-
+                                                                // Give the priority to locked selection since it probably
+                                                                // reflects the actual situation. (#6083, #6987)
+                                                                var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
+                                                                if ( lockedSelection )
+                                                                {
+                                                                        lockedSelection.unlock( 1 );
+                                                                        lockedSelection.lock();
+                                                                }
+                                                                // Then check ff we have saved a range, restore it at this
+                                                                // point.
+                                                                else if ( savedRange && restoreEnabled )
+                                                                {
+                                                                        // Well not break because of this.
+                                                                        try { savedRange.select(); } catch (e) {}
                                                                         savedRange = null;
                                                                 }
                                                         });

_source/plugins/wysiwygarea/plugin.js

@@ -30 +30 @@
                         {
                                 this.focus();
 
+                                // Since the insertion might happen from within dialog or menu
+                                // where the editor selection might be locked at the moment,
+                                // update the locked selection.
+                                var selection = this.getSelection(),
+                                selIsLocked = selection.isLocked;
+
+                                selIsLocked && selection.unlock();
+
                                 this.fire( 'saveSnapshot' );
 
                                 insertFunc.call( this, evt.data );
 
+                                selIsLocked && this.getSelection().lock();
+
                                 // Save snaps after the whole execution completed.
                                 // This's a workaround for make DOM modification's happened after
                                 // 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents'
@@ -83 +93 @@
 
                 if ( CKEDITOR.env.ie )
                 {
-                        var selIsLocked = selection.isLocked;
-
-                        if ( selIsLocked )
-                                selection.unlock();
-
                         var $sel = selection.getNative();
 
                         // Delete control selections to avoid IE bugs on pasteHTML.
@@ -113 +118 @@
                         }
 
                         $sel.createRange().pasteHTML( data );
-
-                        if ( selIsLocked )
-                                this.getSelection().lock();
                 }
                 else
                         this.document.$.execCommand( 'inserthtml', false, data );