Ticket #7746: 7746.patch
File 7746.patch, 2.1 KB (added by , 13 years ago) |
---|
-
_source/plugins/toolbar/plugin.js
174 174 175 175 var output = [ '<div class="cke_toolbox" role="group" aria-labelledby="', labelId, '" onmousedown="return false;"' ], 176 176 expanded = editor.config.toolbarStartupExpanded !== false, 177 avoidGroupMix = editor.skin.avoidGroupMix, 177 178 groupStarted; 178 179 179 180 output.push( expanded ? '>' : ' style="display:none">' ); … … 230 231 231 232 if ( item ) 232 233 { 234 // Some skins do not accept mixing toolbar items that accept 235 // groups with those that do not accept it. In this case we 236 // need to split the toolbar row. (#7746) 237 if ( avoidGroupMix && 238 ( ( item.canGroup && !groupStarted && toolbarObj ) || 239 ( !item.canGroup && groupStarted ) ) ) 240 { 241 // Create a new row including all elements after the current item, inclusive. 242 var newRow = row.items ? CKEDITOR.tools.clone( row ) : items.slice( i ); 243 newRow.items && ( newRow.items = items.slice( i ) ); 244 245 // Add the new toolbar after the current one. 246 toolbar.splice( r + 1, 0, newRow ); 247 248 // Reduce the current toolbar to contain the processed items only. 249 items.splice( i ); 250 251 // Stop this toolbar processing, so it'll restart for 252 // the newly created toolbar. 253 break; 254 } 255 233 256 // Initialize the toolbar first, if needed. 234 257 if ( !toolbarObj ) 235 258 { -
_source/skins/kama/skin.js
12 12 dialog : { css : [ 'dialog.css' ] }, 13 13 templates : { css : [ 'templates.css' ] }, 14 14 margins : [ 0, 0, 0, 0 ], 15 avoidGroupMix : 1, 15 16 init : function( editor ) 16 17 { 17 18 if ( editor.config.width && !isNaN( editor.config.width ) )