Changeset 6985

Timestamp:

05/29/11 11:20:47 (2 years ago)

Author:

Saare

Message:

#7904, #7905, #7916, #7919: Fixing a regression of [6920].

Location:

CKEditor/trunk/_source/plugins

Files:

• colorbutton/plugin.js (modified) (1 diff)
• floatpanel/plugin.js (modified) (2 diffs)
• menu/plugin.js (modified) (2 diffs)
• richcombo/plugin.js (modified) (1 diff)

CKEditor/trunk/_source/plugins/colorbutton/plugin.js

@@ -116 +116 @@
                                         editor.focus();
 
-                                        panel.hide();
-
+                                        panel.hide( false );
 
                                         editor.fire( 'saveSnapshot' );

CKEditor/trunk/_source/plugins/floatpanel/plugin.js

@@ -325 +325 @@
                         },
 
-                        hide : function()
+                        hide : function( returnFocus )
                         {
                                 if ( this.visible && ( !this.onHide || this.onHide.call( this ) !== true ) )
@@ -337 +337 @@
 
                                         // Return focus properly. (#6247)
-                                        var focusReturn = this._.returnFocus;
+                                        var focusReturn = returnFocus !== false && this._.returnFocus;
                                         if ( focusReturn )
                                         {

CKEditor/trunk/_source/plugins/menu/plugin.js

@@ -115 +115 @@
                         onClick : function( item )
                         {
-                                this.hide();
+                                this.hide( false );
 
                                 if ( item.onClick )
@@ -355 +355 @@
                         },
 
-                        hide : function()
+                        hide : function( returnFocus )
                         {
                                 this._.onHide && this._.onHide();
-                                this._.panel && this._.panel.hide();
+                                this._.panel && this._.panel.hide( returnFocus );
                         }
                 }

CKEditor/trunk/_source/plugins/richcombo/plugin.js

@@ -277 +277 @@
                                                 me.setValue( '' );
 
-                                        panel.hide();
+                                        panel.hide( false );
                                 };