Index: /CKEditor/trunk/_source/plugins/clipboard/dialogs/paste.js =================================================================== --- /CKEditor/trunk/_source/plugins/clipboard/dialogs/paste.js (revision 3484) +++ /CKEditor/trunk/_source/plugins/clipboard/dialogs/paste.js (revision 3485) @@ -8,49 +8,4 @@ var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname; - var iframeId = 'cke_' + CKEDITOR.tools.getNextNumber(); - - // For document.domain compatibility (#123) we must do all the magic in - // the URL for IE. - var src = - isCustomDomain ? - 'javascript:void((function(){' + - 'document.open();' + - 'document.domain=\'' + document.domain + '\';' + - 'document.write( window.parent.CKEDITOR._htmlToLoad );' + - 'document.close();' + - 'document.body.contentEditable = true;' + - 'delete window.parent.CKEDITOR._htmlToLoad;' + - 'window.focus();' + - '})())' - : - 'javascript:void(0)'; - - var iframeHtml = - '' + - ''; - - var htmlToLoad = - '' + - ''; - return { title : editor.lang.clipboard.title, @@ -58,38 +13,100 @@ minWidth : 350, minHeight : 240, + htmlToLoad : '', onShow : function() { - if ( isCustomDomain ) - CKEDITOR._htmlToLoad = htmlToLoad; + if ( CKEDITOR.env.ie ) + this.getParentEditor().document.getBody().$.contentEditable = 'false'; + + // FIREFOX BUG: Force the browser to render the dialog to make the to-be- + // inserted iframe editable. (#3366) + this.parts.dialog.$.offsetHeight; + + var container = this.getContentElement( 'general', 'editing_area' ).getElement(), + iframe = CKEDITOR.dom.element.createFromHtml( '' ); + + var lang = this.getParentEditor().lang; + + iframe.setStyles( + { + width : '346px', + height : '130px', + 'background-color' : 'white', + border : '1px solid black' + } ); + iframe.setCustomData( 'dialog', this ); + + var accTitle = lang.editorTitle.replace( '%1', lang.clipboard.title ); + + if ( CKEDITOR.env.ie ) + container.setHtml( '' + + CKEDITOR.tools.htmlEncode( accTitle ) + + '' ); else { - var iframe = CKEDITOR.document.getById( iframeId ); + container.setHtml( '' ); + container.setAttributes( + { + role : 'region', + title : accTitle + } ); + iframe.setAttributes( + { + role : 'region', + title : ' ' + } ); + } + container.append( iframe ); + if ( CKEDITOR.env.ie ) + container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' ); - var $doc = iframe.$.contentWindow.document; - $doc.open(); - $doc.write( htmlToLoad ); - $doc.close(); + if ( isCustomDomain ) + { + CKEDITOR._cke_htmlToLoad = this.definition.htmlToLoad; + iframe.setAttribute( 'src', + 'javascript:void( (function(){' + + 'document.open();' + + 'document.domain="' + document.domain + '";' + + 'document.write( window.parent.CKEDITOR._cke_htmlToLoad );' + + 'delete window.parent.CKEDITOR._cke_htmlToLoad;' + + 'document.close();' + + '})() )' ); + } + else + { + var doc = iframe.$.contentWindow.document; + doc.open(); + doc.write( this.definition.htmlToLoad ); + doc.close(); + } + }, - iframe.$.contentWindow.focus(); - } + onHide : function() + { + if ( CKEDITOR.env.ie ) + this.getParentEditor().document.getBody().$.contentEditable = 'true'; }, onOk : function() { - var iframe = CKEDITOR.document.getById( iframeId ); + var container = this.getContentElement( 'general', 'editing_area' ).getElement(), + iframe = container.getElementsByTag( 'iframe' ).getItem( 0 ), + editor = this.getParentEditor(), + html = iframe.$.contentWindow.document.body.innerHTML; - var body = new CKEDITOR.dom.element( - iframe.$.contentDocument ? - iframe.$.contentDocument.body : - iframe.$.contentWindow.document.body ) ; + editor.insertHtml( html ); - var html = body.getHtml(); - - // Fix relative anchor URLs (IE automatically adds the current page URL). - var re = new RegExp( window.location + "#", 'g' ); - html = html.replace( re, '#'); - - this.getParentEditor().insertHtml( html ); }, @@ -111,7 +128,23 @@ { type : 'html', - id : 'content', - style : 'width:340px;height:130px', - html : '

' + iframeHtml + '

' + id : 'editing_area', + style : 'width: 100%; height: 100%;', + html : '

', + focus : function() + { + var div = this.getElement(); + var iframe = div.getElementsByTag( 'iframe' ); + if ( iframe.count() < 1 ) + return; + iframe = iframe.getItem( 0 ); + + // #3291 : JAWS needs the 500ms delay to detect that the editor iframe + // iframe is no longer editable. So that it will put the focus into the + // Paste from Word dialog's editable area instead. + setTimeout( function() + { + iframe.$.contentWindow.focus(); + }, 500 ); + } } ] Index: /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 3484) +++ /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 3485) @@ -210,5 +210,5 @@ { var container = this.getContentElement( 'general', 'editing_area' ).getElement(), - iframe = container.getFirst(), + iframe = container.getElementsByTag( 'iframe' ).getItem( 0 ), editor = this.getParentEditor(), html = this.definition.cleanWord( editor, iframe.$.contentWindow.document.body.innerHTML, Index: /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js (revision 3484) +++ /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js (revision 3485) @@ -8,6 +8,4 @@ CKEDITOR.dialog.add( 'pastetext', function( editor ) { - var textareaId = 'cke_' + CKEDITOR.tools.getNextNumber(); - return { title : editor.lang.pasteText.title, @@ -19,5 +17,5 @@ { // Reset the textarea value. - CKEDITOR.document.getById( textareaId ).setValue( '' ); + this.getContentElement( 'general', 'content' ).getInputElement().setValue( '' ); }, @@ -25,5 +23,5 @@ { // Get the textarea value. - var text = CKEDITOR.document.getById( textareaId ).getValue(); + var text = this.getContentElement( 'general', 'content' ).getInputElement().getValue(); // Inserts the text. @@ -35,4 +33,5 @@ { label : editor.lang.common.generalTab, + id : 'general', elements : [ @@ -47,5 +46,5 @@ style : 'width:340px;height:170px', html : - '' + '', + focus : function() + { + this.getElement().focus(); + } } ]