Ticket #4881: 4881.patch

_source/plugins/clipboard/plugin.js

@@ -68 +68 @@
         {
                 exec : function( editor, data )
                 {
+                        this.type == 'cut' && fixCut( editor );
+
                         var success = tryToCutCopy( editor, this.type );
 
                         if ( !success )
@@ -248 +250 @@
                 }, 0 );
         }
 
+        // Cutting off control type element in IE standards breaks the selection entirely. (#4881)
+        function fixCut( editor )
+        {
+                if ( !CKEDITOR.env.ie || editor.document.$.compatMode == 'BackCompat' )
+                        return;
+
+                var sel = editor.getSelection();
+                var control;
+                if( ( sel.getType() == CKEDITOR.SELECTION_ELEMENT ) && ( control = sel.getSelectedElement() ) )
+                {
+                        var range = sel.getRanges()[ 0 ];
+                        var dummy = editor.document.createText( '' );
+                        dummy.insertBefore( control );
+                        range.setStartBefore( dummy );
+                        range.setEndAfter( control );
+                        sel.selectRanges( [ range ] );
+
+                        // Clear up the fix if the paste wasn't succeeded.
+                        setTimeout( function()
+                        {
+                                // Element still online?
+                                if ( control.getParent() )
+                                {
+                                        dummy.remove();
+                                        sel.selectElement( control );
+                                }
+                        }, 0 );
+                }
+        }
+        
         // Register the plugin.
         CKEDITOR.plugins.add( 'clipboard',
                 {
@@ -318 +350 @@
                                         body.on( ( (mode == 'text' && CKEDITOR.env.ie) || CKEDITOR.env.webkit ) ? 'paste' : 'beforepaste',
                                                 function( evt )
                                                 {
-                                                        if ( depressBeforePasteEvent )
+                                                        if ( depressBeforeEvent )
                                                                 return;
 
                                                         getClipboardData.call( editor, evt, mode, function ( data )
@@ -334 +366 @@
                                                         } );
                                                 });
 
+                                        body.on( 'beforecut', function() { !depressBeforeEvent && fixCut( editor ); } );
                                 });
 
                                 // If the "contextmenu" plugin is loaded, register the listeners.
                                 if ( editor.contextMenu )
                                 {
-                                        var depressBeforePasteEvent;
+                                        var depressBeforeEvent;
                                         function stateFromNamedCommand( command )
                                         {
-                                                // IE Bug: queryCommandEnabled('paste') fires also 'beforepaste',
+                                                // IE Bug: queryCommandEnabled('paste') fires also 'beforepaste(copy/cut)',
                                                 // guard to distinguish from the ordinary sources( either
                                                 // keyboard paste or execCommand ) (#4874).
-                                                CKEDITOR.env.ie && command == 'Paste'&& ( depressBeforePasteEvent = 1 );
+                                                CKEDITOR.env.ie && ( depressBeforeEvent = 1 );
 
                                                 var retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;
-                                                depressBeforePasteEvent = 0;
+                                                depressBeforeEvent = 0;
                                                 return retval;
                                         }