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.4.2
[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
496b8a6
..
2bc3142
100644
(file)
--- a/
_source/plugins/clipboard/dialogs/paste.js
+++ b/
_source/plugins/clipboard/dialogs/paste.js
@@
-10,10
+10,10
@@
CKEDITOR.dialog.add( 'paste', function( editor )
\r
function onPasteFrameLoad( win )
\r
{
\r
\r
function onPasteFrameLoad( win )
\r
{
\r
- var doc = new CKEDITOR.dom.document( win.document ),
\r
+ var doc = new CKEDITOR.dom.document( win.document ),
\r
docElement = doc.$;
\r
\r
docElement = doc.$;
\r
\r
- doc.getById( "cke_actscrpt" ).remove();
\r
+ doc.getById( 'cke_actscrpt' ).remove();
\r
\r
CKEDITOR.env.ie ?
\r
docElement.body.contentEditable = "true" :
\r
\r
CKEDITOR.env.ie ?
\r
docElement.body.contentEditable = "true" :
\r
@@
-76,6
+76,7
@@
CKEDITOR.dialog.add( 'paste', function( editor )
\r
var iframe = CKEDITOR.dom.element.createFromHtml(
\r
'<iframe' +
\r
\r
var iframe = CKEDITOR.dom.element.createFromHtml(
\r
'<iframe' +
\r
+ ' class="cke_pasteframe"' +
\r
' frameborder="0" ' +
\r
' allowTransparency="true"' +
\r
// Support for custom document.domain in IE.
\r
' frameborder="0" ' +
\r
' allowTransparency="true"' +
\r
// Support for custom document.domain in IE.
\r
@@
-103,13
+104,6
@@
CKEDITOR.dialog.add( 'paste', function( editor )
doc.close();
\r
}, this );
\r
\r
doc.close();
\r
}, this );
\r
\r
- iframe.setStyles(
\r
- {
\r
- width : '346px',
\r
- height : '130px',
\r
- 'background-color' : 'white',
\r
- border : '1px solid black'
\r
- } );
\r
iframe.setCustomData( 'dialog', this );
\r
\r
var field = this.getContentElement( 'general', 'editing_area' ),
\r
iframe.setCustomData( 'dialog', this );
\r
\r
var field = this.getContentElement( 'general', 'editing_area' ),
\r