Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.5.3
[ckeditor.git]
/
_source
/
plugins
/
clipboard
/
dialogs
/
paste.js
diff --git
a/_source/plugins/clipboard/dialogs/paste.js
b/_source/plugins/clipboard/dialogs/paste.js
index
93edc0d
..
e0813ec
100644
(file)
--- a/
_source/plugins/clipboard/dialogs/paste.js
+++ b/
_source/plugins/clipboard/dialogs/paste.js
@@
-164,7
+164,12
@@
CKEDITOR.dialog.add( 'paste', function( editor )
var container = this.getContentElement( 'general', 'editing_area' ).getElement(),
\r
iframe = container.getElementsByTag( 'iframe' ).getItem( 0 ),
\r
editor = this.getParentEditor(),
\r
var container = this.getContentElement( 'general', 'editing_area' ).getElement(),
\r
iframe = container.getElementsByTag( 'iframe' ).getItem( 0 ),
\r
editor = this.getParentEditor(),
\r
- html = iframe.$.contentWindow.document.body.innerHTML;
\r
+ body = iframe.getFrameDocument().getBody(),
\r
+ bogus = body.getBogus(),
\r
+ html;
\r
+ bogus && bogus.remove();
\r
+ // Saving the contents in variable so changes until paste is complete will not take place (#7500)
\r
+ html = body.getHtml();
\r
\r
setTimeout( function(){
\r
editor.fire( 'paste', { 'html' : html } );
\r
\r
setTimeout( function(){
\r
editor.fire( 'paste', { 'html' : html } );
\r