Changeset 6095

Timestamp:

11/15/10 13:26:07 (3 years ago)

Author:

Saare

Message:

#6640: Floating panels are now being closed when switching modes.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/floatpanel/plugin.js (modified) (1 diff)
• _source/plugins/menubutton/plugin.js (modified) (2 diffs)
• _source/plugins/richcombo/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -55 +55 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6479">#6479</a> : BIDI: Language direction is not being preserved when pressing Enter after a paragraph format has been applied.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6670">#6670</a> : BIDI: Indent & List icons are not reversed when we apply RTL direction to a paragraph with any of Paragraph Formatting options.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6640">#6640</a> : Floating panels are now being closed when switching modes.</li>
         </ul>
         <h3>

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

@@ -61 +61 @@
                                 dir : editor.lang.dir
                         };
+
+                        editor.on( 'mode', function(){ this.hide(); }, this );
                 },
 

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

@@ -41 +41 @@
                         menu.onHide = CKEDITOR.tools.bind( function()
                                 {
-                                        this.setState( _.previousState );
+                                        this.setState( this.modes && this.modes[ editor.mode ] ? _.previousState : CKEDITOR.TRISTATE_DISABLED );
                                 },
                                 this );
@@ -47 +47 @@
                         // Initialize the menu items at this point.
                         if ( this.onMenu )
-                        {
                                 menu.addListener( this.onMenu );
-                        }
                 }
 

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

@@ -245 +245 @@
                                                 this.element.getFirst().removeClass( me.className + '_panel' );
 
-                                        me.setState( CKEDITOR.TRISTATE_OFF );
+                                        me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
 
                                         me._.on = 0;