Merge pull request #3641 from ckeditor/t/3586

Fix for incorrect recognition of Excel content

CHANGES.md

@@ -15,6 +15,7 @@ Fixed Issues:
 * [#3593](https://github.com/ckeditor/ckeditor4/issues/3593): Fixed: Can't access text or comment node while replacing element node with them via [`CKEDITOR.htmlParser.filter`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_htmlParser_filter.html).
 * [#3524](https://github.com/ckeditor/ckeditor4/issues/3524): Fixed: [Easy Image](https://ckeditor.com/cke4/addon/easyimage) plugin throws an error when any image with not supported data type is pasted into editor.
 * [#3552](https://github.com/ckeditor/ckeditor4/issues/3352): Fixed: Incorrect value of [`CKEDITOR.plugins.widget.repository#selected`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_repository.html#property-selected) after selecting whole editor's content.
+* [#3586](https://github.com/ckeditor/ckeditor4/issues/3586): Fixed: Content pasted from Excel is not correctly recognised by [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
 
 ## CKEditor 4.13
 

plugins/pastefromword/plugin.js

@@ -74,7 +74,8 @@
 
 				canHandle: function( evt ) {
 					var data = evt.data,
-						mswordHtml = data.dataValue,
+						// Always get raw clipboard data (#3586).
+						mswordHtml = CKEDITOR.plugins.pastetools.getClipboardData( data, 'text/html' ),
 						officeMetaRegexp = /<meta\s*name=(?:\"|\')?generator(?:\"|\')?\s*content=(?:\"|\')?microsoft/gi,
 						wordRegexp = /(class=\"?Mso|style=(?:\"|\')[^\"]*?\bmso\-|w:WordDocument|<o:\w+>|<\/font>)/,
 						isOfficeContent = officeMetaRegexp.test( mswordHtml ) || wordRegexp.test( mswordHtml );

tests/plugins/pastefromword/manual/preserveexcelstyles.html

@@ -0,0 +1,11 @@
+<div id="editor">
+	<p>Paste things here</p>
+</div>
+
+<script>
+	if ( CKEDITOR.env.safari || ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) ) {
+		bender.ignore();
+	}
+
+	CKEDITOR.replace( 'editor' );
+</script>

tests/plugins/pastefromword/manual/preserveexcelstyles.md

@@ -0,0 +1,15 @@
+@bender-tags: bug, 4.13.1, 3586
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, undo, basicstyles, pastefromword, elementspath, tabletools, justify, colorbutton
+
+1. Open [sample Excel file](_assets/3586.xlsx).
+1. Copy the blue table.
+1. Paste into the editor.
+
+## Expected
+
+Formatting is preserved.
+
+## Unexpected
+
+Formatting (especially background color) is not preserved.

tests/plugins/pastefromword/metageneratordetection.js

@@ -39,14 +39,40 @@
 
 		'test generator attribute inside content': function() {
 			testMetaDetection( this.editor, false, '', '<p name="generator" content="microsoft">Tets</p>' );
+		},
+
+		// (#3586)
+		'test detection with dataTransfer': function() {
+			testMetaDetection( this.editor, true, 'Microsoft Excel 16', '<p>Test</p>', {
+				dataTransfer: true
+			} );
 		}
 	};
 
 	ptTools.ignoreTestsOnMobiles( tests );
 
 	bender.test( tests );
 
-	function testMetaDetection( editor, success, generatorValue, content ) {
+	function testMetaDetection( editor, success, generatorValue, content, options ) {
+		var evtData = {
+				type: 'auto',
+				dataValue: generateHtml( generatorValue, content ),
+				method: 'paste'
+			},
+			dataType = CKEDITOR.env.ie && CKEDITOR.env.version < 16 ? 'Text' : 'text/html',
+			isDataTransferTest = options && !!options.dataTransfer,
+			nativeDataTransfer,
+			dataTransfer;
+
+		if ( isDataTransferTest ) {
+			nativeDataTransfer = bender.tools.mockNativeDataTransfer();
+			nativeDataTransfer.setData( dataType, evtData.dataValue );
+
+			dataTransfer = new CKEDITOR.plugins.clipboard.dataTransfer( nativeDataTransfer );
+			evtData.dataValue = dataTransfer.getData( dataType );
+			evtData.dataTransfer = dataTransfer;
+		}
+
 		editor.once( 'paste', function( evt ) {
 			resume( function() {
 				if ( success ) {
@@ -57,11 +83,7 @@
 			} );
 		}, null, null, 999 );
 
-		editor.fire( 'paste', {
-			type: 'auto',
-			dataValue: generateHtml( generatorValue, content ),
-			method: 'paste'
-		} );
+		editor.fire( 'paste', evtData );
 
 		wait();
 	}
@@ -70,5 +92,4 @@
 		var body = content || '<p>foo <strong>bar</strong></p>';
 		return '<html><head><meta name=Generator content="' + generatorValue + '"></head><body>' + body + '</body></html>';
 	}
-
 } )();