Skip to content

Commit 53dff67

Browse files
committed
Merge branch 't/9522'
2 parents bc0c4c1 + dd63ef2 commit 53dff67

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

plugins/clipboard/plugin.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -651,17 +651,18 @@
651651

652652
pastebin.setAttribute( 'id', 'cke_pastebin' );
653653

654+
// Append bogus to prevent Opera from doing this. (#9522)
655+
if ( CKEDITOR.env.opera )
656+
pastebin.appendBogus();
657+
654658
var containerOffset = 0,
655659
win = doc.getWindow();
656660

657661
// Seems to be the only way to avoid page scroll in Fx 3.x.
658-
if ( ff3x )
659-
{
662+
if ( ff3x ) {
660663
pastebin.insertAfter( bms[ 0 ].startNode );
661664
pastebin.setStyle( 'display', 'inline' );
662-
}
663-
else
664-
{
665+
} else {
665666
if ( CKEDITOR.env.webkit ) {
666667
// It's better to paste close to the real paste destination, so inherited styles
667668
// (which Webkits will try to compensate by styling span) differs less from the destination's one.

0 commit comments

Comments
 (0)