Changeset 6095


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r6094 r6095  
    5555                <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> 
    5656                <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> 
     57                <li><a href="http://dev.ckeditor.com/ticket/6640">#6640</a> : Floating panels are now being closed when switching modes.</li> 
    5758        </ul> 
    5859        <h3> 
  • CKEditor/trunk/_source/plugins/floatpanel/plugin.js

    r6044 r6095  
    6161                                dir : editor.lang.dir 
    6262                        }; 
     63 
     64                        editor.on( 'mode', function(){ this.hide(); }, this ); 
    6365                }, 
    6466 
  • CKEditor/trunk/_source/plugins/menubutton/plugin.js

    r5283 r6095  
    4141                        menu.onHide = CKEDITOR.tools.bind( function() 
    4242                                { 
    43                                         this.setState( _.previousState ); 
     43                                        this.setState( this.modes && this.modes[ editor.mode ] ? _.previousState : CKEDITOR.TRISTATE_DISABLED ); 
    4444                                }, 
    4545                                this ); 
     
    4747                        // Initialize the menu items at this point. 
    4848                        if ( this.onMenu ) 
    49                         { 
    5049                                menu.addListener( this.onMenu ); 
    51                         } 
    5250                } 
    5351 
  • CKEditor/trunk/_source/plugins/richcombo/plugin.js

    r5909 r6095  
    245245                                                this.element.getFirst().removeClass( me.className + '_panel' ); 
    246246 
    247                                         me.setState( CKEDITOR.TRISTATE_OFF ); 
     247                                        me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED ); 
    248248 
    249249                                        me._.on = 0; 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy