Ticket #7366: 7366_2.patch

_source/plugins/clipboard/plugin.js

@@ -29 +29 @@
                 body.on( command, onExec );
 
                 // IE6/7: document.execCommand has problem to paste into positioned element.
-                ( CKEDITOR.env.version > 7 ? doc.$ : doc.$.selection.createRange() ) [ 'execCommand' ]( command );
+                doc.$.selection.createRange()[ 'execCommand' ]( command )
 
                 body.removeListener( command, onExec );
 
@@ -281 +281 @@
         }
 
         var depressBeforeEvent;
+        var depressPasteEvent;
         function stateFromNamedCommand( command, editor )
         {
                 // IE Bug: queryCommandEnabled('paste') fires also 'beforepaste(copy/cut)',
@@ -382 +383 @@
                                         var body = editor.document.getBody();
                                         body.on( CKEDITOR.env.webkit ? 'paste' : 'beforepaste', function( evt )
                                                 {
-                                                        if ( depressBeforeEvent )
+                                                        // To dismiss some wrong ones in IE, e.g. when menu is opened.
+                                                        if ( depressBeforeEvent ||
+                                                                 evt.data && evt.data.$ && ( evt.data.$.offsetY < 0 || evt.data.$.offsetX < 0 ) )
+                                                        {
                                                                 return;
+                                                        }
 
                                                         // Fire 'beforePaste' event so clipboard flavor get customized
                                                         // by other plugins.
@@ -403 +408 @@
                                                         } );
                                                 });
 
-                                        // Dismiss the (wrong) 'beforepaste' event fired on context menu open. (#7953)
+                                        // Handle paste from browser toolbar menu which misses the "beforepaste" event.
+                                        CKEDITOR.env.ie && body.on( 'paste', function( evt )
+                                        {
+                                                if ( ! ( depressPasteEvent || editor.document.getById( 'cke_pastebin' ) ) )
+                                                {
+                                                        // Prevent native paste.
+                                                        evt.data.preventDefault();
+
+                                                        depressPasteEvent = 1;
+                                                        window.setTimeout( function() { depressPasteEvent = 0; } );
+
+                                                        // Resort to the paste command.
+                                                        pasteCmd.exec( editor );
+                                                }
+                                        });
+
+                                        // Dismiss the (wrong) 'beforepaste' event fired on context menu open.
                                         body.on( 'contextmenu', function()
                                         {
                                                 depressBeforeEvent = 1;