Ticket #7304: 7304_3.patch

_source/plugins/pastefromword/plugin.js

@@ -12 +12 @@
                         // Flag indicate this command is actually been asked instead of a generic
                         // pasting.
                         var forceFromWord = 0;
-                        var resetFromWord = function()
+                        var resetFromWord = function( evt )
                                 {
-                                        setTimeout( function() { forceFromWord = 0; }, 0 );
+                                        evt && evt.removeListener();
+                                        forceFromWord && setTimeout( function() { forceFromWord = 0; }, 0 );
                                 };
 
                         // Features bring by this command beside the normal process:
@@ -29 +30 @@
                                         forceFromWord = 1;
                                         if ( editor.execCommand( 'paste' ) === false )
                                         {
-                                                editor.on( 'dialogHide', function ( evt )
-                                                        {
-                                                                evt.removeListener();
-                                                                resetFromWord();
-                                                        });
+                                                editor.on( 'dialogShow', function ( evt )
+                                                {
+                                                        evt.removeListener();
+                                                        evt.data.on( 'cancel', resetFromWord );
+                                                });
+
+                                                editor.on( 'dialogHide', function( evt )
+                                                {
+                                                        evt.data.removeListener( 'cancel', resetFromWord );
+                                                } );
                                         }
-                                        else
-                                                resetFromWord();
+
+                                        editor.on( 'afterPaste', resetFromWord );
                                 }
                         });
 

_source/plugins/clipboard/plugin.js

@@ -327 +327 @@
                                                 else if ( data[ 'text' ] )
                                                         editor.insertText( data[ 'text' ] );
 
+                                                setTimeout( function () { editor.fire( 'afterPaste' ) }, 0 );
+
                                         }, null, null, 1000 );
 
                                 editor.on( 'pasteDialog', function( evt )
@@ -393 +395 @@
                                                         {
                                                                 // The very last guard to make sure the
                                                                 // paste has successfully happened.
-                                                                if ( !data )
+                                                                if ( !CKEDITOR.tools.trim( data ) )
                                                                         return;
 
                                                                 var dataTransfer = {};