diff --git a/editors/ckeditor.inc b/editors/ckeditor.inc index a5a506c..ae0280f 100644 --- a/editors/ckeditor.inc +++ b/editors/ckeditor.inc @@ -336,7 +336,6 @@ function wysiwyg_ckeditor_settings($editor, $config, $theme) { 'width' => 'auto', // For better compatibility with smaller textareas. 'resize_minWidth' => 450, - 'height' => 420, // @todo Do not use skins as themes and add separate skin handling. 'theme' => 'default', 'skin' => !empty($theme) ? $theme : $default_skin, diff --git a/editors/fckeditor.inc b/editors/fckeditor.inc index 68c2f98..672e6d1 100644 --- a/editors/fckeditor.inc +++ b/editors/fckeditor.inc @@ -164,7 +164,6 @@ function wysiwyg_fckeditor_settings($editor, $config, $theme) { 'SkinPath' => base_path() . $editor['library path'] . '/editor/skins/' . $theme . '/', 'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js', 'Width' => '100%', - 'Height' => 420, 'LinkBrowser' => FALSE, 'LinkUpload' => FALSE, 'ImageBrowser' => FALSE, diff --git a/editors/js/ckeditor-3.0.js b/editors/js/ckeditor-3.0.js index 6ca05d2..a079469 100644 --- a/editors/js/ckeditor-3.0.js +++ b/editors/js/ckeditor-3.0.js @@ -39,7 +39,9 @@ Drupal.wysiwyg.editor.attach.ckeditor = function(context, params, settings) { CKEDITOR.config.customConfig = ''; var $drupalToolbars = $('#toolbar, #admin-menu', Drupal.overlayChild ? window.parent.document : document); - + if (!settings.height) { + settings.height = $('#' + params.field).height(); + } settings.on = { instanceReady: function(ev) { var editor = ev.editor; diff --git a/editors/js/epiceditor.js b/editors/js/epiceditor.js index 3ca1a36..4e561e7 100644 --- a/editors/js/epiceditor.js +++ b/editors/js/epiceditor.js @@ -6,8 +6,13 @@ Drupal.wysiwyg.editor.attach.epiceditor = function (context, params, settings) { var $target = $('#' + params.field), containerId = params.field + '-epiceditor', - defaultContent = $target.val(); - $target.hide().after('
'); + defaultContent = $target.val(), + $container = $('
'); + $target.hide().after($container); + if (!settings.height) { + settings.height = $('#' + params.field).height(); + } + $container.height(settings.height); settings.container = containerId; settings.file = { diff --git a/editors/js/fckeditor-2.6.js b/editors/js/fckeditor-2.6.js index fd915e3..47a4f00 100644 --- a/editors/js/fckeditor-2.6.js +++ b/editors/js/fckeditor-2.6.js @@ -4,6 +4,9 @@ * Attach this editor to a target element. */ Drupal.wysiwyg.editor.attach.fckeditor = function(context, params, settings) { + if (!settings.Height) { + settings.Height = $('#' + params.field).height(); + } var FCKinstance = new FCKeditor(params.field, settings.Width, settings.Height, settings.ToolbarSet); // Apply editor instance settings. FCKinstance.BasePath = settings.EditorPath;