Skip to content
Permalink
Browse files

Merge branch 't/13554'

  • Loading branch information...
oleq committed Jul 24, 2015
2 parents 649f074 + e4777ff commit 58140c42568cbea86c16e36a95a8b41d71ed27c3
Showing with 18 additions and 3 deletions.
  1. +2 −0 CHANGES.md
  2. +2 −2 plugins/clipboard/dialogs/paste.js
  3. +1 −1 plugins/dialog/plugin.js
  4. +4 −0 tests/tickets/13554/1.html
  5. +9 −0 tests/tickets/13554/1.md
@@ -25,6 +25,8 @@ Fixed Issues:
* [#13387](http://dev.ckeditor.com/ticket/13387): [Edge] Fixed: "Permission denied" error thrown while loading the editor with developer tools open.
* [#13409](http://dev.ckeditor.com/ticket/13409): Fixed: List elements incorrectly merged when pressing *Backspace* or *Delete*.
* [#13441](http://dev.ckeditor.com/ticket/13441): [Edge] Fixed: [Clipboard](http://ckeditor.com/addon/clipboard) plugin breaks the state of [Undo](http://ckeditor.com/addon/undo) commands after paste.
* [#13554](http://dev.ckeditor.com/ticket/13554): [Edge] Fixed: Paste dialog's iframe does not receive focus on show.
* [#13574](http://dev.ckeditor.com/ticket/13574): [Edge] Fixed: Permission denied thrown while opening editor dialogs.

Other Changes:

@@ -133,7 +133,7 @@ CKEDITOR.dialog.add( 'paste', function( editor ) {
var src =
CKEDITOR.env.air ?
'javascript:void(0)' : // jshint ignore:line
CKEDITOR.env.ie ?
( CKEDITOR.env.ie && !CKEDITOR.env.edge ) ?
'javascript:void((function(){' + encodeURIComponent( // jshint ignore:line
'document.open();' +
'(' + CKEDITOR.tools.fixDomain + ')();' +
@@ -170,7 +170,7 @@ CKEDITOR.dialog.add( 'paste', function( editor ) {

// IE need a redirect on focus to make
// the cursor blinking inside iframe. (#5461)
if ( CKEDITOR.env.ie ) {
if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
var focusGrabber = CKEDITOR.dom.element.createFromHtml( '<span tabindex="-1" style="position:absolute" role="presentation"></span>' );
focusGrabber.on( 'focus', function() {
// Since fixDomain is called in src attribute,
@@ -181,7 +181,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
editor.plugins.clipboard && CKEDITOR.plugins.clipboard.preventDefaultDropOnElement( body );

// IFrame shim for dialog that masks activeX in IE. (#7619)
if ( CKEDITOR.env.ie && !CKEDITOR.env.quirks ) {
if ( CKEDITOR.env.ie && !CKEDITOR.env.quirks && !CKEDITOR.env.edge ) {
var src = 'javascript:void(function(){' + encodeURIComponent( 'document.open();(' + CKEDITOR.tools.fixDomain + ')();document.close();' ) + '}())', // jshint ignore:line
iframe = CKEDITOR.dom.element.createFromHtml( '<iframe' +
' frameBorder="0"' +
@@ -0,0 +1,4 @@
<textarea id="editor1"></textarea>
<script>
var editor = CKEDITOR.replace( 'editor1' );
</script>
@@ -0,0 +1,9 @@
@bender-tags: 4.5.2, tc, paste, 13554
@bender-ui: collapsed
@bender-ckeditor-plugins: wysiwygarea, toolbar, clipboard, pastefromword, pastetext

###Only on IE Edge###

1. Open paste dialog.

**Expected**: The caret within the dialog should be visible at the beginning of the iframe (box), blinking.

0 comments on commit 58140c4

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