Merge branch 't/13690'

Reinmar · Reinmar · commit d232212f3105 · 2015-09-21T11:44:41.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -18,6 +18,7 @@ Fixed Issues:
 * [#13533](http://dev.ckeditor.com/ticket/13533): Fixed: No progress during upload.
 * [#13680](http://dev.ckeditor.com/ticket/13680): Fixed: The parser should allow `<h1-6>` to be a child of the `<summary>` element.
 * [#11724](http://dev.ckeditor.com/ticket/11724): [Touch devices] Fixed: Drop-downs often hide right after opening them.
+* [#13690](http://dev.ckeditor.com/ticket/13690): Fixed: Copying content from IE to Chrome adding extra paragraph.
 
 Other Changes:
 
diff --git a/plugins/clipboard/plugin.js b/plugins/clipboard/plugin.js
@@ -2081,8 +2081,8 @@
 		}
 
 		this._ = {
-			metaRegExp: /^<meta.*?>/,
-			bodyRegExp: /<body(?:[\s\S]*?)>([\s\S]*)<\/body>/,
+			metaRegExp: /^<meta.*?>/i,
+			bodyRegExp: /<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,
 			fragmentRegExp: /<!--(?:Start|End)Fragment-->/g,
 
 			data: {},
diff --git a/tests/plugins/clipboard/datatransfer.js b/tests/plugins/clipboard/datatransfer.js
@@ -1,4 +1,4 @@
-/* bender-tags: editor,unit,clipboard */
+/* bender-tags: editor,unit,clipboard,13690 */
 /* bender-ckeditor-plugins: toolbar,clipboard */
 /* bender-include: _helpers/pasting.js */
 
@@ -298,6 +298,25 @@ bender.test( {
 		assert.areSame( 'foo<b>bom</b>xbar', dataTransfer.getData( 'text/html' ) );
 	},
 
+	'test getData body filter uppercase tags': function() {
+		if ( !CKEDITOR.plugins.clipboard.isCustomDataTypesSupported ) {
+			assert.ignore();
+		}
+
+		var nativeData = bender.tools.mockNativeDataTransfer();
+		nativeData.setData( 'text/html',
+			'<HTML>' +
+			'<BODY foo="bar" bar=foo bom=\'bim\'>' +
+			'<!--StartFragment-->foo<B>bom</B>x' +
+			'bar<!--EndFragment-->' +
+			'</BODY>' +
+			'</HTML>' );
+
+		var dataTransfer = new CKEDITOR.plugins.clipboard.dataTransfer( nativeData );
+
+		assert.areSame( 'foo<B>bom</B>xbar', dataTransfer.getData( 'text/html' ) );
+	},
+
 	'test getData body filter for tables': function() {
 		if ( !CKEDITOR.plugins.clipboard.isCustomDataTypesSupported ) {
 			assert.ignore();

Original file line number	Diff line number	Diff line change
`@@ -2081,8 +2081,8 @@`
`2081`	`2081`	`}`
`2082`	`2082`
`2083`	`2083`	`this._ = {`
`2084`		`- metaRegExp: /^<meta.*?>/,`
`2085`		`- bodyRegExp: /<body(?:[\s\S]?)>([\s\S])<\/body>/,`
	`2084`	`+ metaRegExp: /^<meta.*?>/i,`
	`2085`	`+ bodyRegExp: /<body(?:[\s\S]?)>([\s\S])<\/body>/i,`
`2086`	`2086`	`fragmentRegExp: /<!--(?:Start\|End)Fragment-->/g,`
`2087`	`2087`
`2088`	`2088`	`data: {},`