Ticket #4048: 4048.patch

_source/skins/kama/skin.js

@@ -22 +22 @@
                 margins         : [ 0, 0, 0, 0 ],
                 init : function( editor )
                 {
-                        var menuHead;
-                        function menuSetUiColor( color )
-                        {
-                                if ( !menuHead )
-                                        return null;
-
-                                var uiStyle = menuHead.append('style');
-
-                                var cssSrc = "/* UI Color Support */\
+                        var uiColorMenus = {};
+                        var uiColorRegex = /\$color/g;
+                        var uiColorMenuCss = "/* UI Color Support */\
 .cke_skin_kama .cke_menuitem .cke_icon_wrapper\
 {\
         background-color: $color !important;\
@@ -85 +79 @@
         background-color: $color !important;\
 }";
 
-                                uiStyle.setAttribute( "type", "text/css" );
-                                var regex = /\$color/g;
+                        function uiColorAddMenu( id, head )
+                        {
+                                uiColorMenus[ id ] = head.append( 'style' );
+                                uiColorMenus[ id ].setAttribute( "type", "text/css" );
 
                                 // We have to split CSS declarations for webkit.
                                 if ( CKEDITOR.env.webkit )
                                 {
-                                        cssSrc = cssSrc.split( '}' ).slice( 0, -1 );
-                                        for ( var i in cssSrc )
-                                                        cssSrc[ i ] = cssSrc[ i ].split( '{' );
+                                        uiColorMenuCss = uiColorMenuCss.split( '}' ).slice( 0, -1 );
+                                        for ( var i in uiColorMenuCss )
+                                                        uiColorMenuCss[ i ] = uiColorMenuCss[ i ].split( '{' );
                                 }
+                        }
 
-                                return ( menuSetUiColor =
-                                        function( color )
-                                        {
-                                                if ( CKEDITOR.env.webkit )
-                                                {
-                                                        for ( var i in cssSrc )
-                                                                uiStyle.$.sheet.addRule(
-                                                                        cssSrc[ i ][ 0 ], cssSrc[ i ][ 1 ].replace( regex, color )
-                                                                );
-                                                }
-                                                else
-                                                {
-                                                        var css = cssSrc.replace( regex, color );
+                        function uiColorUpdateMenus( color )
+                        {
+                                for ( var id in uiColorMenus )
+                                {
+                                        if ( CKEDITOR.env.webkit )
+                                        {
+                                                for ( var i in uiColorMenuCss )
+                                                        uiColorMenus[ id ].$.sheet.addRule(
+                                                                uiColorMenuCss[ i ][ 0 ], uiColorMenuCss[ i ][ 1 ].replace( uiColorRegex, color )
+                                                        );
+                                        }
+                                        else
+                                        {
+                                                var css = uiColorMenuCss.replace( uiColorRegex, color );
 
-                                                        if ( CKEDITOR.env.ie )
-                                                                uiStyle.$.styleSheet.cssText = css;
-                                                        else
-                                                                uiStyle.setHtml( css );
-                                                }
-                                        })( color );
-                        }
+                                                if ( CKEDITOR.env.ie )
+                                                        uiColorMenus[ id ].$.styleSheet.cssText = css;
+                                                else
+                                                        uiColorMenus[ id ].setHtml( css );
+                                        }
+                                }
+                        }
 
                         CKEDITOR.tools.extend( editor,
                         {
@@ -156 +154 @@
                                                         else
                                                                 uiStyle.setHtml( cssSelectors + '{' + css + '}' );
 
-                                                        menuSetUiColor( color );
+                                                        uiColorUpdateMenus( color );
                                                 })( color );
                                 }
                         });
@@ -170 +168 @@
                                 {
                                         old.apply( this, arguments );
 
-                                        if ( !menuHead && editor == this.editor )
+                                        if ( !uiColorMenus[ this.id ] && editor == this.editor )
                                         {
-                                                // Save reference.
-                                                menuHead = this._.element.getDocument().getHead();
-                                                menuSetUiColor( editor.getUiColor() );
+                                                uiColorAddMenu( this.id, this._.element.getDocument().getHead() );
+                                                uiColorUpdateMenus( editor.getUiColor() );
                                         }
                                 };
                         }
@@ -182 +179 @@
                         // Apply UI color if specified in config.
                         if ( editor.config.uiColor )
                                 editor.setUiColor( editor.config.uiColor );
-
-                        // Fix editor's width. HPadding and 100% width iframe issue.
-//                      if ( CKEDITOR.env.ie && CKEDITOR.env.quirks )
-//                      {
-//                              editor.on( 'mode', function( event )
-//                              {
-//                                      var container = editor.getResizable();
-//                                      editor.resize( container.$.offsetWidth-10, container.$.offsetHeight );
-//                                      event.removeListener();
-//                              });
-//                      }
-
-//                      if ( CKEDITOR.env.ie && ( CKEDITOR.env.quirks || CKEDITOR.env.version < 7 ) )
-//                      {
-//                              editor.on( 'themeLoaded', function( event )
-//                              {
-//                                      var toolbars = editor.container.getChild( [0, 0, 0, 0, 0, 0, 0] ).getChildren();
-//                                      for ( var i = 0 ; i < toolbars.count() ; i++ )
-//                                      {
-//                                              var toolbar = toolbars.getItem( i );
-
-//                                              var last = toolbar.getLast();
-//                                              if ( !last || !last.getPrevious().hasClass( 'cke_rcombo' ) )
-//                                                      continue;
-//
-//                                              last.addClass( 'cke_toolbar_end_last' );
-//                                      }
-//                              });
-//                      }
                 }
         };
 })() );

CHANGES.html

@@ -162 +162 @@
                         ckeditor2.html test case.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3989">#3989</a> : Host page horizontal scrolling a lot when on having righ-to-left direction.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4001">#4001</a> : Create link around existing image result incorrect.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4048">#4048</a> : Context submenu lacks uiColor.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>

_source/plugins/menu/plugin.js

@@ -122 +122 @@
 
                         show : function( offsetParent, corner, offsetX, offsetY )
                         {
+                                console.log( 'menu#show' )
                                 var items = this.items,
                                         editor = this.editor,
                                         panel = this._.panel,