X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=inline;f=_source%2Fplugins%2Fclipboard%2Fdialogs%2Fpaste.js;h=2bc3142b6f0255d6f5d4628a1fd50112f262dd07;hb=614511639979907ceb0da3614122a4d8eb963ad4;hp=70527ad46db6b335ca261a642c9fe615c34cf039;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git diff --git a/_source/plugins/clipboard/dialogs/paste.js b/_source/plugins/clipboard/dialogs/paste.js index 70527ad..2bc3142 100644 --- a/_source/plugins/clipboard/dialogs/paste.js +++ b/_source/plugins/clipboard/dialogs/paste.js @@ -10,19 +10,24 @@ CKEDITOR.dialog.add( 'paste', function( editor ) function onPasteFrameLoad( win ) { - var doc = new CKEDITOR.dom.document( win.document ), - $ = doc.$; + var doc = new CKEDITOR.dom.document( win.document ), + docElement = doc.$; - doc.getById( "cke_actscrpt" ).remove(); + doc.getById( 'cke_actscrpt' ).remove(); CKEDITOR.env.ie ? - $.body.contentEditable = "true" : - $.designMode = "on"; + docElement.body.contentEditable = "true" : + docElement.designMode = "on"; - CKEDITOR.env.ie && doc.getWindow().on( 'blur', function() + // IE before version 8 will leave cursor blinking inside the document after + // editor blurred unless we clean up the selection. (#4716) + if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) { - $.body.contentEditable = "false"; - } ); + doc.getWindow().on( 'blur', function() + { + docElement.selection.empty(); + } ); + } doc.on( "keydown", function( e ) { @@ -60,13 +65,18 @@ CKEDITOR.dialog.add( 'paste', function( editor ) // inserted iframe editable. (#3366) this.parts.dialog.$.offsetHeight; - var htmlToLoad = '
' + - ''; + var htmlToLoad = + '' + + '' + + '' + + ''; var iframe = CKEDITOR.dom.element.createFromHtml( '