### Eclipse Workspace Patch 1.0 Index: sites/all/modules/wysiwyg/editors/js/fckeditor.config.js =================================================================== --- sites/all/modules/wysiwyg/editors/js/fckeditor.config.js (revision 32) +++ sites/all/modules/wysiwyg/editors/js/fckeditor.config.js (working copy) @@ -18,7 +18,25 @@ for (var setting in wysiwygSettings) { if (setting == 'buttons') { // Apply custom Wysiwyg toolbar for this format. - FCKConfig.ToolbarSets['Wysiwyg'] = wysiwygSettings.buttons; + FCKConfig.ToolbarSets['Wysiwyg'] = []; + for (var i = 0; i < wysiwygSettings.buttons[0].length; i++) { + FCKConfig.ToolbarSets['Wysiwyg'].push([wysiwygSettings.buttons[0][i]]); + } + + /** + * Corrections to the FCKeditor toolbar (temporary solution until #277954 is fixed). + * - remove separator between buttons + * - set valid height of select element in silver and office2003 skins + */ + FCKTools.AppendStyleSheet(document, '#xToolbar .TB_Start{display:none}'); + + if (FCKConfig.SkinPath.match(/\/office2003\/$/)) { + FCKTools.AppendStyleSheet(document, '#xToolbar .SC_FieldCaption{height:24px} #xToolbar .TB_End{display:none}'); + } + if (FCKConfig.SkinPath.match(/\/silver\/$/)) { + FCKTools.AppendStyleSheet(document, '#xToolbar .SC_FieldCaption{height:27px}'); + } + } else { FCKConfig[setting] = wysiwygSettings[setting];