vanilla ckeditor-3.5.4

[ckeditor.git] / _source / plugins / clipboard / plugin.js

diff --git a/_source/plugins/clipboard/plugin.js b/_source/plugins/clipboard/plugin.js
index 342d708..ebfb1f8 100644 (file)
--- a/_source/plugins/clipboard/plugin.js
+++ b/_source/plugins/clipboard/plugin.js
@@ -158,6 +158,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                }\r
        };\r
 \r
+       function cancel( evt ) { evt.cancel(); }\r
+\r
        // Allow to peek clipboard content by redirecting the\r
        // pasting content into a temporary bin and grab the content of it.\r
        function getClipboardData( evt, mode, callback )\r
@@ -208,19 +210,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                var bms = sel.createBookmarks();\r
 \r
+               this.on( 'selectionChange', cancel, null, null, 0 );\r
+\r
                // Turn off design mode temporarily before give focus to the paste bin.\r
                if ( mode == 'text' )\r
-               {\r
-                       if ( CKEDITOR.env.ie )\r
-                       {\r
-                               var ieRange = doc.getBody().$.createTextRange();\r
-                               ieRange.moveToElementText( pastebin.$ );\r
-                               ieRange.execCommand( 'Paste' );\r
-                               evt.data.preventDefault();\r
-                       }\r
-                       else\r
-                               pastebin.$.focus();\r
-               }\r
+                       pastebin.$.focus();\r
                else\r
                {\r
                        range.setStartAt( pastebin, CKEDITOR.POSITION_AFTER_START );\r
@@ -234,6 +228,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                {\r
                        mode == 'text' && CKEDITOR.env.gecko && editor.focusGrabber.focus();\r
                        pastebin.remove();\r
+                       editor.removeListener( 'selectionChange', cancel );\r
 \r
                        // Grab the HTML contents.\r
                        // We need to look for a apple style wrapper on webkit it also adds\r
@@ -322,6 +317,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                else if ( data[ 'text' ] )\r
                                                        editor.insertText( data[ 'text' ] );\r
 \r
+                                               setTimeout( function () { editor.fire( 'afterPaste' ); }, 0 );\r
+\r
                                        }, null, null, 1000 );\r
 \r
                                editor.on( 'pasteDialog', function( evt )\r
@@ -370,29 +367,31 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                editor.on( 'key', onKey, editor );\r
 \r
-                               var mode = editor.config.forcePasteAsPlainText ? 'text' : 'html';\r
-\r
                                // We'll be catching all pasted content in one line, regardless of whether the\r
                                // it's introduced by a document command execution (e.g. toolbar buttons) or\r
                                // user paste behaviors. (e.g. Ctrl-V)\r
                                editor.on( 'contentDom', function()\r
                                {\r
                                        var body = editor.document.getBody();\r
-                                       body.on( ( ( mode == 'text' && CKEDITOR.env.ie ) || CKEDITOR.env.webkit ) ? 'paste' : 'beforepaste',\r
-                                               function( evt )\r
+                                       body.on( CKEDITOR.env.webkit ? 'paste' : 'beforepaste', function( evt )\r
                                                {\r
                                                        if ( depressBeforeEvent )\r
                                                                return;\r
 \r
-                                                       getClipboardData.call( editor, evt, mode, function ( data )\r
+                                                       // Fire 'beforePaste' event so clipboard flavor get customized\r
+                                                       // by other plugins.\r
+                                                       var eventData =  { mode : 'html' };\r
+                                                       editor.fire( 'beforePaste', eventData );\r
+\r
+                                                       getClipboardData.call( editor, evt, eventData.mode, function ( data )\r
                                                        {\r
                                                                // The very last guard to make sure the\r
                                                                // paste has successfully happened.\r
-                                                               if ( !data )\r
+                                                               if ( !( data = CKEDITOR.tools.trim( data.replace( /<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,'' ) ) ) )\r
                                                                        return;\r
 \r
                                                                var dataTransfer = {};\r
-                                                               dataTransfer[ mode ] = data;\r
+                                                               dataTransfer[ eventData.mode ] = data;\r
                                                                editor.fire( 'paste', dataTransfer );\r
                                                        } );\r
                                                });\r