Skip to content
Permalink
Browse files

Merge branch 't/16857' into major

  • Loading branch information
mlewand committed Mar 15, 2017
2 parents e0e0043 + 0a68d3c commit caa3bcb3c2577691eaf1337be4ac69079eb24960
@@ -11,6 +11,7 @@ New Features:

Fixed Issues:

* [#16857](http://dev.ckeditor.com/ticket/16857): Fixed: Ctrl + Shift + V blocked by copy formatting.
* [#14714](http://dev.ckeditor.com/ticket/14714): [Webkit/Blink] Exception thrown on refocusing a blurred inline editor.
* [#16821](http://dev.ckeditor.com/ticket/16821): Fixed: Extraneous `spans` with `height` style stacked when [pasting from Word](http://ckeditor.com/addon/pastefromword).
* [#12465](http://dev.ckeditor.com/ticket/12465): Fixed: Can't change state of checkboxes/radio buttons if the properties dialog was invoked via double-click.
@@ -437,7 +437,8 @@
if ( !isFromKeystroke && cmd.state !== CKEDITOR.TRISTATE_ON ) {
return;
} else if ( isFromKeystroke && !copyFormatting.styles ) {
return plugin._putScreenReaderMessage( editor, 'failed' );
plugin._putScreenReaderMessage( editor, 'failed' );
return false;
}

isApplied = plugin._applyFormat( editor, copyFormatting.styles );
@@ -435,6 +435,18 @@
assertScreenReaderNotification( editor, 'failed' );
},

'test premature paste formatting keystroke': function( editor ) {
var prevent = sinon.spy(),
keystroke = CKEDITOR.CTRL + CKEDITOR.SHIFT + 77;

editor.editable().fire( 'keydown', new CKEDITOR.dom.event( {
keyCode: keystroke,
preventDefault: prevent
} ) );

assert.isFalse( prevent.called );
},

'test notifications': function( editor ) {
var copyformatting = CKEDITOR.plugins.copyformatting;

@@ -0,0 +1,8 @@
<div id="editor" contenteditable="true">
<p><u>Some underlined text</u></p>
<p>Some text</p>
</div>

<script>
CKEDITOR.replace( 'editor' );
</script>
@@ -0,0 +1,21 @@
@bender-ui: collapsed
@bender-tags: tc, copyformatting, 4.7.0
@bender-ckeditor-plugins: copyformatting, toolbar, wysiwygarea, floatingspace, elementspath, undo, basicstyles

## Test scenario 1

1. Paste some rich formatted text using `Ctrl + Shift + V`.

## Expected

Content gets pasted as a plain text.

## Test scenario 2

1. Put the caret in the first paragraph and hit `Ctrl + Shift + C`.
2. Use the arrow keys to place the caret in the second paragraph.
3. Hit `Ctrl + Shift + V`

## Expected

Underline is applied to the selected content in the second paragraph.

0 comments on commit caa3bcb

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