mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Revert "ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field" - causes artificial loading delay, and doesn't detect height correctly due to floated images in paragraphs. These paragraphs can't be clearfix'ed because they'd become contenteditable (resizeable) elements in IE because of this.
This reverts commit 69a8659a3d
.
This commit is contained in:
parent
d46a4504f5
commit
4fc3aaf939
@ -25,7 +25,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
|
||||
'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]"
|
||||
));
|
||||
|
||||
HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen', 'autoresize');
|
||||
HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen');
|
||||
HtmlEditorConfig::get('cms')->enablePlugins(array('ssbuttons' => '../../../cms/javascript/tinymce_ssbuttons/editor_plugin_src.js'));
|
||||
|
||||
HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
|
||||
|
@ -13,7 +13,7 @@ class HtmlEditorField extends TextareaField {
|
||||
*/
|
||||
static $use_gzip = true;
|
||||
|
||||
protected $rows = null;
|
||||
protected $rows = 30;
|
||||
|
||||
/**
|
||||
* Includes the JavaScript neccesary for this field to work using the {@link Requirements} system.
|
||||
@ -90,6 +90,7 @@ class HtmlEditorField extends TextareaField {
|
||||
parent::getAttributes(),
|
||||
array(
|
||||
'tinymce' => 'true',
|
||||
'style' => 'width: 97%; height: ' . ($this->rows * 16) . 'px', // prevents horizontal scrollbars
|
||||
'value' => null,
|
||||
)
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user