Skip to content

Commit

Permalink
Merge branch 't/9712'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Dec 6, 2012
2 parents 2e9da01 + ede2fdb commit 5c1f1d6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions plugins/floatpanel/plugin.js
Expand Up @@ -142,6 +142,8 @@ CKEDITOR.plugins.add( 'floatpanel', {

var element = this.element,
iframe = this._.iframe,
// Non IE prefer the event into a window object.
focused = CKEDITOR.env.ie ? iframe : new CKEDITOR.dom.window( iframe.$.contentWindow ),
doc = element.getDocument(),
positionedAncestor = this._.parentElement.getPositionedAncestor(),
position = offsetParent.getDocumentPosition( doc ),
Expand Down Expand Up @@ -175,10 +177,11 @@ CKEDITOR.plugins.add( 'floatpanel', {
// To allow the context menu to decrease back their width
element.getFirst().removeStyle( 'width' );

// Report to focus manager.
this._.editor.focusManager.add( focused );

// Configure the IFrame blur event. Do that only once.
if ( !this._.blurSet ) {
// Non IE prefer the event into a window object.
var focused = CKEDITOR.env.ie ? iframe : new CKEDITOR.dom.window( iframe.$.contentWindow );

// With addEventListener compatible browsers, we must
// useCapture when registering the focus/blur events to
Expand Down Expand Up @@ -210,9 +213,6 @@ CKEDITOR.plugins.add( 'floatpanel', {

CKEDITOR.event.useCapture = false;

// Report to focus manager.
this._.editor.focusManager.add( focused );

this._.blurSet = 1;
}

Expand Down

0 comments on commit 5c1f1d6

Please sign in to comment.