Ticket #6718: 6718_3.patch

../3.6.x/_source/plugins/clipboard/plugin.js

@@ -214 +214 @@
 
                 // Turn off design mode temporarily before give focus to the paste bin.
                 if ( mode == 'text' )
-                {
-                        if ( CKEDITOR.env.ie )
-                        {
-                                var ieRange = doc.getBody().$.createTextRange();
-                                ieRange.moveToElementText( pastebin.$ );
-                                ieRange.execCommand( 'Paste' );
-                                evt.data.preventDefault();
-                        }
-                        else
-                                pastebin.$.focus();
-                }
+                        pastebin.$.focus();
                 else
                 {
                         range.setStartAt( pastebin, CKEDITOR.POSITION_AFTER_START );
@@ -377 +367 @@
 
                                 editor.on( 'key', onKey, editor );
 
-                                var mode = editor.config.forcePasteAsPlainText ? 'text' : 'html';
-
                                 // We'll be catching all pasted content in one line, regardless of whether the
                                 // it's introduced by a document command execution (e.g. toolbar buttons) or
                                 // user paste behaviors. (e.g. Ctrl-V)
                                 editor.on( 'contentDom', function()
                                 {
                                         var body = editor.document.getBody();
-                                        body.on( ( ( mode == 'text' && CKEDITOR.env.ie ) || CKEDITOR.env.webkit ) ? 'paste' : 'beforepaste',
-                                                function( evt )
+                                        body.on( 'beforepaste', function( evt )
                                                 {
                                                         if ( depressBeforeEvent )
                                                                 return;
 
-                                                        getClipboardData.call( editor, evt, mode, function ( data )
+                                                        // Fire 'beforePaste' event so clipboard flavor get customized
+                                                        // by other plugins.
+                                                        var eventData =  { mode : 'html' };
+                                                        editor.fire( 'beforePaste', eventData );
+
+                                                        getClipboardData.call( editor, evt, eventData.mode, function ( data )
                                                         {
                                                                 // The very last guard to make sure the
                                                                 // paste has successfully happened.
@@ -399 +391 @@
                                                                         return;
 
                                                                 var dataTransfer = {};
-                                                                dataTransfer[ mode ] = data;
+                                                                dataTransfer[ eventData.mode ] = data;
                                                                 editor.fire( 'paste', dataTransfer );
                                                         } );
                                                 });

../3.6.x/_source/plugins/pastetext/plugin.js

@@ -58 +58 @@
                                 // Intercept the default pasting process.
                                 editor.on( 'beforeCommandExec', function ( evt )
                                 {
-                                        if ( evt.data.name == 'paste' )
+                                        var mode = evt.data.commandData;
+                                        // Do NOT overwrite if HTML format is explicitly requested.
+                                        if ( evt.data.name == 'paste' && mode != 'html' )
                                         {
                                                 editor.execCommand( 'pastetext' );
                                                 evt.cancel();
                                         }
                                 }, null, null, 0 );
+
+                                editor.on( 'beforePaste', function( evt )
+                                {
+                                        evt.data.mode = 'text';
+                                });
                         }
 
                         editor.on( 'pasteState', function( evt )
@@ -82 +89 @@
  * Whether to force all pasting operations to insert on plain text into the
  * editor, loosing any formatting information possibly available in the source
  * text.
+ * <strong>Note:</strong> paste from word is not affected by this configuration.
  * @name CKEDITOR.config.forcePasteAsPlainText
  * @type Boolean
  * @default false

../3.6.x/_source/plugins/pastefromword/plugin.js

@@ -1 @@
-?/*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 (function()
 {
+        function forceHtmlMode( evt ) { evt.data.mode = 'html'; }
+
         CKEDITOR.plugins.add( 'pastefromword',
         {
                 init : function( editor )
@@ -15 +17 @@
                         var resetFromWord = function( evt )
                                 {
                                         evt && evt.removeListener();
+                                        editor.removeListener( 'beforePaste', forceHtmlMode );
                                         forceFromWord && setTimeout( function() { forceFromWord = 0; }, 0 );
                                 };
 
@@ -27 +30 @@
                                 canUndo : false,
                                 exec : function()
                                 {
+                                        // Ensure the received data format is HTML and apply content filtering. (#6718)
                                         forceFromWord = 1;
-                                        if ( editor.execCommand( 'paste' ) === false )
+                                        editor.on( 'beforePaste', forceHtmlMode );
+
+                                        if ( editor.execCommand( 'paste', 'html' ) === false )
                                         {
                                                 editor.on( 'dialogShow', function ( evt )
                                                 {