Ticket #3716: 3716_2.patch

_source/plugins/floatpanel/plugin.js

@@ -128 +128 @@
                                                 display : ''
                                         });
 
+                                // Non IE prefer the event into a window object.
+                                var focused = CKEDITOR.env.ie ? iframe : new CKEDITOR.dom.window( iframe.$.contentWindow );
+
                                 // Configure the IFrame blur event. Do that only once.
-                                if ( !this._.blurSet )
+                                if ( !focused.getCustomData( 'blurSet' ) )
                                 {
-                                        // Non IE prefer the event into a window object.
-                                        var focused = CKEDITOR.env.ie ? iframe : new CKEDITOR.dom.window( iframe.$.contentWindow );
-
                                         focused.on( 'blur', function()
                                                 {
-                                                        if ( !this._.activeChild && !isShowing )
+                                                        if ( !iframe.getCustomData( 'activeChild' ) && !isShowing )
                                                                 this.hide();
                                                 },
                                                 this );
 
                                         focused.on( 'focus', function()
                                                 {
-                                                        this._.focused = true;
+                                                        iframe.setCustomData( 'focused', true );
                                                         this.hideChild();
                                                 },
                                                 this );
 
-                                        this._.blurSet = 1;
+                                        focused.setCustomData( 'blurSet', true );
                                 }
 
                                 panel.onEscape = CKEDITOR.tools.bind( function()
@@ -232 +232 @@
 
                         hide : function()
                         {
-                                if ( !this.onHide || this.onHide.call( this ) !== true )
+                                var onHide = this._.iframe.getCustomData( 'onHide' );
+
+                                if ( !onHide || onHide.call( this ) !== true )
                                 {
                                         this.hideChild();
                                         this.element.setStyle( 'display', 'none' );
@@ -241 +243 @@
 
                         showAsChild : function( panel, blockName, offsetParent, corner, offsetX, offsetY )
                         {
+                                var iframe = this._.iframe;
+
                                 this.hideChild();
 
-                                panel.onHide = CKEDITOR.tools.bind( function()
+                                panel._.iframe.setCustomData( 'onHide', CKEDITOR.tools.bind( function()
                                         {
                                                 // Use a timeout, so we give time for this menu to get
                                                 // potentially focused.
                                                 CKEDITOR.tools.setTimeout( function()
                                                         {
-                                                                if ( !this._.focused )
+                                                                if ( !iframe.getCustomData( 'focused' ) )
                                                                         this.hide();
                                                         },
                                                         0, this );
                                         },
-                                        this );
+                                        this ) );
 
-                                this._.activeChild = panel;
-                                this._.focused = false;
+                                iframe.setCustomData( 'activeChild', panel );
+                                iframe.removeCustomData( 'focused' );
 
                                 panel.showBlock( blockName, offsetParent, corner, offsetX, offsetY );
                         },
 
                         hideChild : function()
                         {
-                                var activeChild = this._.activeChild;
+                                var iframe = this._.iframe;
+                                var activeChild = iframe.getCustomData( 'activeChild' );
 
                                 if ( activeChild )
                                 {
-                                        delete activeChild.onHide;
-                                        delete this._.activeChild;
+                                        activeChild._.iframe.removeCustomData( 'onHide' );
+                                        iframe.removeCustomData( 'activeChild' );
                                         activeChild.hide();
                                 }
                         }