Ticket #6170: 6170_2.patch

_source/plugins/richcombo/plugin.js

@@ -226 +226 @@
 
                         panel.onShow = function()
                                 {
+                                        // Remove the previous used classname to prevent incorrect styles from being applied (#6170)
+                                        var element = this.element.getFirst(),
+                                                activeClass;
+                                        if ( ( activeClass = element.getCustomData( 'activeClass' ) ) )
+                                                element.removeClass( activeClass );
                                         if ( me.className )
-                                                this.element.getFirst().addClass( me.className + '_panel' );
+                                        {
+                                                var className = me.className + '_panel';
+                                                element.addClass( className );
+                                                element.setCustomData( 'activeClass', className );
+                                        }
 
                                         me.setState( CKEDITOR.TRISTATE_ON );
 
@@ -241 +250 @@
 
                         panel.onHide = function()
                                 {
+                                        var element = this.element.getFirst();
                                         if ( me.className )
-                                                this.element.getFirst().removeClass( me.className + '_panel' );
+                                                element.removeClass( me.className + '_panel' );
+                                        element.removeCustomData( 'activeClass' );
 
                                         me.setState( CKEDITOR.TRISTATE_OFF );