diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini index af49565977952..534757aae0c24 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini @@ -52,6 +52,7 @@ PLG_TINY_FIELD_FUNCTIONALITY_DESC="Select level of functionality." PLG_TINY_FIELD_FUNCTIONALITY_LABEL="Functionality" PLG_TINY_FIELD_HR_DESC="Show or hide the Horizontal Rule button." PLG_TINY_FIELD_HR_LABEL="Horizontal Rule" +; The following 4 strings are deprecated and will be removed with 4.0 PLG_TINY_FIELD_HTMLHEIGHT_DESC="Height of HTML editor. Only applies in Advanced and Extended mode." PLG_TINY_FIELD_HTMLHEIGHT_LABEL="HTML Height" PLG_TINY_FIELD_HTMLWIDTH_DESC="Width of HTML editor. Should normally be left empty to let it flow. Only applies in Advanced and Extended mode." diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php index 79c4dbe878dc0..887cea66967b5 100644 --- a/plugins/editors/tinymce/tinymce.php +++ b/plugins/editors/tinymce/tinymce.php @@ -168,6 +168,16 @@ public function onDisplay( $doc = JFactory::getDocument(); $options = $doc->getScriptOptions('plg_editor_tinymce'); + if (empty($width)) + { + $width = "100%"; + } + + if (empty($height)) + { + $height = "500px"; + } + // Only add "px" to width and height if they are not given as a percentage if (is_numeric($width)) { @@ -406,14 +416,6 @@ public function onDisplay( $valid_elements = trim($levelParams->get('valid_elements', '')); } - $html_height = $this->params->get('html_height', '550'); - $html_width = $this->params->get('html_width', ''); - - if ($html_width == 750) - { - $html_width = ''; - } - // The param is true for vertical resizing only, false or both $resizing = (bool) $levelParams->get('resizing', true); $resize_horizontal = (bool) $levelParams->get('resize_horizontal', true); @@ -660,8 +662,6 @@ public function onDisplay( 'paste_data_images' => $allowImgPaste, 'importcss_append' => true, 'image_title' => true, - 'height' => $html_height, - 'width' => $html_width, 'resize' => $resizing, 'templates' => $templates, 'image_advtab' => (bool) $levelParams->get('image_advtab', false), diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml index 5e0c759068226..69aa7bbed397c 100644 --- a/plugins/editors/tinymce/tinymce.xml +++ b/plugins/editors/tinymce/tinymce.xml @@ -39,21 +39,7 @@ description="PLG_TINY_FIELD_NUMBER_OF_SETS_DESC" default="3" /> - -