Ticket #3068: 3068_2.patch

plugins/floatpanel/plugin.js

@@ -64 +64 @@
                                 children : [],
                                 dir : editor.lang.dir
                         };
+
+                        var me = this;
+
+                        // If the "contextmenu" plugin is loaded, register the listener.
+                        if ( editor.contextMenu )
+                        {
+                                editor.contextMenu.addListener( function()
+                                        {
+                                                me.hide(); 
+                                        });
+                        }
+                        editor.on( 'beforeCommandExec', function()
+                                {
+                                        me.hide(); 
+                                });
                 },
 
                 proto :
@@ -124 +139 @@
                                                 display : ''
                                         });
 
+                                if ( this.onShow )
+                                        this.onShow.call( this );
+
                                 // Configure the IFrame blur event. Do that only once.
                                 if ( !this._.blurSet )
                                 {
@@ -132 +150 @@
 
                                         focused.on( 'blur', function()
                                                 {
+                                                        if ( !this._.panel.allowBlur )
+                                                                return;
+
                                                         if ( !this._.activeChild )
                                                                 this.hide();
                                                 },
@@ -141 +162 @@
                                                 {
                                                         this._.focused = true;
                                                         this.hideChild();
+                                                        this.allowBlur( true );
                                                 },
                                                 this );
 
@@ -186 +208 @@
                                                                 iframe.$.contentWindow.focus();
                                                         }, 0);
                                         }, 0);
+                        },
 
-                                if ( this.onShow )
-                                        this.onShow.call( this );
+                        allowBlur : function( allow )
+                        {
+                                this._.panel.allowBlur = allow;
                         },
 
                         hide : function()

plugins/panel/plugin.js

@@ -261 +261 @@
 
                 hide : function()
                 {
-                        this.element.setStyle( 'display', 'none' );
+                        if ( !this.onHide || this.onHide.call( this )  !== true )
+                                this.element.setStyle( 'display', 'none' );
                 },
 
                 onKeyDown : function( keystroke )

plugins/panelbutton/plugin.js

@@ -84 +84 @@
                                                 return;
 
                                         this.createPanel( editor );
+                                        var panel = _.panel;
+                                        panel.allowBlur( false );
 
                                         if ( _.on )
                                         {
-                                                _.panel.hide();
+                                                panel.hide();
                                                 return;
                                         }
-
-                                        _.panel.showBlock( this._.id, new CKEDITOR.dom.element( $element ), 4 );
+                                        panel.showBlock( this._.id, new CKEDITOR.dom.element( $element ), 4 );
+                                        setTimeout( function()
+                                                {
+                                                        if ( CKEDITOR.env.gecko )
+                                                                panel._.iframe.$.focus();                                       // Force blur.
+                                                        panel.allowBlur( true );
+                                                }, 0 );
                                 },
                                 this );
                         var keyDownFn = CKEDITOR.tools.addFunction( function( ev, element ){
@@ -210 +217 @@
                                         me.document.getById( _.id ).focus();
                                 };
 
-
                         if ( this.onBlock )
                                 this.onBlock( panel, _.id );
+
+                        panel.getBlock( _.id ).onHide = function()
+                                {
+                                        _.on = 0;
+                                        me.setState( CKEDITOR.TRISTATE_OFF );
+                                }
                 },
 
                 setState : CKEDITOR.ui.button.prototype.setState

plugins/richcombo/plugin.js

@@ -93 +93 @@
 
                                         this.createPanel( editor );
 
+                                        var panel = _.panel;
+                                        panel.allowBlur( false );
+
                                         if ( _.on )
                                         {
-                                                _.panel.hide();
+                                                panel.hide();
                                                 return;
                                         }
 
@@ -111 +114 @@
                                         else
                                                 _.list.unmarkAll();
 
-                                        _.panel.showBlock( this.id, new CKEDITOR.dom.element( $element ).getFirst(), 4 );
+                                        panel.showBlock( this.id, new CKEDITOR.dom.element( $element ).getFirst(), 4 );
+
+                                        setTimeout( function()
+                                                {
+                                                        if (CKEDITOR.env.gecko )
+                                                                panel._.iframe.$.focus();                                       // Force blur.
+                                                        panel.allowBlur( true );
+                                                }, 0 );
                                 },
                                 this );
 
@@ -264 +274 @@
                         this._.panel = panel;
                         this._.list = list;
 
+                        panel.getBlock( this.id ).onHide = function()
+                                {
+                                        me._.on = 0;
+                                        me.setState( CKEDITOR.TRISTATE_OFF );
+                                }
+
                         if ( this.init )
                                 this.init();
                 },

plugins/stylescombo/plugin.js

@@ -149 +149 @@
 
                                         onOpen : function()
                                         {
-                                                editor.focus();
+                                                if ( CKEDITOR.env.ie )
+                                                        editor.focus();
 
                                                 var selection = editor.getSelection();