Ticket #4874: 4874_2.patch

_source/plugins/clipboard/plugin.js

@@ -303 +303 @@
                                         body.on( ( mode == 'text' && CKEDITOR.env.ie ) ? 'paste' : 'beforepaste',
                                                 function( evt )
                                                 {
+                                                        if( depressBeforePasteEvent )
+                                                                return;
+
                                                         getClipboardData.call( editor, evt, mode, function ( data )
                                                         {
                                                                 // The very last guard to make sure the
@@ -321 +324 @@
                                 // If the "contextmenu" plugin is loaded, register the listeners.
                                 if ( editor.contextMenu )
                                 {
+                                        var depressBeforePasteEvent;
                                         function stateFromNamedCommand( command )
                                         {
-                                                return editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;
+                                                // IE Bug: queryCommandEnabled('paste') fires also 'beforepaste',
+                                                // guard to distinguish from the ordinary sources( either
+                                                // keyboard paste or execCommand ) (#4874).
+                                                CKEDITOR.env.ie && command == 'Paste'&& ( depressBeforePasteEvent = 1 );
+
+                                                var retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;
+                                                depressBeforePasteEvent = 0;
+                                                return retval;
                                         }
 
                                         editor.contextMenu.addListener( function()

_source/plugins/contextmenu/plugin.js

@@ -177 +177 @@
                                 } );
                         }
 
-                        // Certain forms of IE selection changes on 'contextmenu' event,
-                        // lock the selection before that.(#4041)
-                        if ( CKEDITOR.env.ie )
-                        {
-                                element.on( 'mousedown', function( event )
-                                {
-                                        if ( event.data.$.button == 2 )
-                                        {
-                                                var selection = this.editor.getSelection();
-                                                selection && selection.lock();
-                                        }
-                                }, this );
-                        }
-
                         element.on( 'contextmenu', function( event )
                                 {
                                         var domEvent = event.data;
@@ -201 +187 @@
                                              ( CKEDITOR.env.webkit ? holdCtrlKey : domEvent.$.ctrlKey || domEvent.$.metaKey ) )
                                                 return;
 
+                                        // Selection will be unavailable after context menu shows up
+                                        // in IE, lock it now.
+                                        if ( CKEDITOR.env.ie )
+                                        {
+                                                var selection = this.editor.getSelection();
+                                                selection && selection.lock();
+                                        }
+
                                         // Cancel the browser context menu.
                                         domEvent.preventDefault();