Ticket #7366: 7366_5.patch

_source/plugins/clipboard/plugin.js

@@ -135 +135 @@
 
                                 var body = this.document.getBody();
 
-                                // Simulate 'beforepaste' event for all none-IEs.
-                                if ( !CKEDITOR.env.ie && body.fire( 'beforepaste' ) )
-                                        event.cancel();
                                 // Simulate 'paste' event for Opera/Firefox2.
-                                else if ( CKEDITOR.env.opera
+                                if ( CKEDITOR.env.opera
                                                  || CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 )
                                         body.fire( 'paste' );
                                 return;
@@ -378 +375 @@
                                 editor.on( 'contentDom', function()
                                 {
                                         var body = editor.document.getBody();
-                                        body.on( CKEDITOR.env.webkit ? 'paste' : 'beforepaste', function( evt )
+
+                                        // Intercept the paste before it actually takes place.
+                                        body.on( !CKEDITOR.env.ie ? 'paste' : 'beforepaste', function( evt )
                                                 {
                                                         if ( depressBeforeEvent )
                                                                 return;
 
+                                                        // Dismiss the "beforepaste" event fired in IE when
+                                                        // opening browser toolbar/context menu.
+                                                        var domEvent = evt.data && evt.data.$;
+                                                        if ( CKEDITOR.env.ie && domEvent && !domEvent.ctrlKey )
+                                                                return;
+
                                                         // Fire 'beforePaste' event so clipboard flavor get customized
                                                         // by other plugins.
                                                         var eventData =  { mode : 'html' };
@@ -401 +406 @@
                                                         } );
                                                 });
 
-                                        // Dismiss the (wrong) 'beforepaste' event fired on context menu open. (#7953)
-                                        body.on( 'contextmenu', function()
+                                        // Handle IE's late coming "paste" event when pasting from
+                                        // browser toolbar/context menu.
+                                        CKEDITOR.env.ie && body.on( 'paste', function( evt )
                                         {
-                                                depressBeforeEvent = 1;
-                                                setTimeout( function() { depressBeforeEvent = 0; }, 10 );
-                                        });
+                                                if ( !editor.document.getById( 'cke_pastebin' ) )
+                                                {
+                                                        // Prevent native paste.
+                                                        evt.data.preventDefault();
+
+                                                        // Resort to the paste command.
+                                                        pasteCmd.exec( editor );
+                                                }
+                                        } );
 
                                         body.on( 'beforecut', function() { !depressBeforeEvent && fixCut( editor ); } );