Skip to content
Permalink
Browse files

Merge branch 't/13690'

  • Loading branch information...
Reinmar committed Sep 21, 2015
2 parents 6f07d5d + 103853d commit d232212f31053b967948af6b3732eafbadd1aaf5
Showing with 23 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +2 −2 plugins/clipboard/plugin.js
  3. +20 −1 tests/plugins/clipboard/datatransfer.js
@@ -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:

@@ -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: {},
@@ -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();

0 comments on commit d232212

Please sign in to comment.
You can’t perform that action at this time.