Ticket #7746: 7746_2.patch

_source/plugins/toolbar/plugin.js

@@ -174 +174 @@
 
                                                 var output = [ '<div class="cke_toolbox" role="group" aria-labelledby="', labelId, '" onmousedown="return false;"' ],
                                                         expanded =  editor.config.toolbarStartupExpanded !== false,
+                                                        avoidGroupMix = editor.skin.avoidGroupMix,
                                                         groupStarted;
 
                                                 output.push( expanded ? '>' : ' style="display:none">' );
@@ -230 +231 @@
 
                                                                 if ( item )
                                                                 {
+                                                                        // Some skins do not accept mixing toolbar items that accept
+                                                                        // groups with those that do not accept it. In this case we
+                                                                        // need to split the toolbar row. (#7746)
+                                                                        if ( avoidGroupMix &&
+                                                                                        ( ( item.canGroup && !groupStarted && toolbarObj ) ||
+                                                                                          ( !item.canGroup && groupStarted ) ) )
+                                                                        {
+                                                                                // Create a new row including all elements after the current item, inclusive.
+                                                                                var newRow = row.items ? CKEDITOR.tools.clone( row ) : items.slice( i );
+                                                                                newRow.items && ( newRow.items = items.slice( i ) );
+
+                                                                                // Add the new toolbar after the current one.
+                                                                                toolbar.splice( r + 1, 0, newRow );
+
+                                                                                // Reduce the current toolbar to contain the processed items only.
+                                                                                items.splice( i );
+
+                                                                                // Stop this toolbar processing, so it'll restart for
+                                                                                // the newly created toolbar.
+                                                                                break;
+                                                                        }
+
                                                                         // Initialize the toolbar first, if needed.
                                                                         if ( !toolbarObj )
                                                                         {
@@ -411 +434 @@
  */
 CKEDITOR.ui.separator =
 {
+        canGroup : 1,
         render : function( editor, output )
         {
                 output.push( '<span class="cke_separator" role="separator"></span>' );

_source/skins/kama/skin.js

@@ -12 +12 @@
                 dialog          : { css : [ 'dialog.css' ] },
                 templates       : { css : [ 'templates.css' ] },
                 margins         : [ 0, 0, 0, 0 ],
+                avoidGroupMix : 1,
                 init : function( editor )
                 {
                         if ( editor.config.width && !isNaN( editor.config.width ) )