tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Soft-code CSS explicit height and compute against rows

Browse Source
This commit is contained in:
Damian Mooyman 2017-08-01 13:59:35 +12:00
parent 078a508d71
commit ae97c15e42
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Forms/HTMLEditor/HTMLEditorField.php
View File

@ -51,7 +51,14 @@ class HTMLEditorField extends TextareaField
* @config * @config
* @var int * @var int
*/ */
private static $default_rows = 30; private static $default_rows = 20;
/**
* Extra height per row
*
* @var int
*/
private static $fixed_row_height = 20;
/** /**
* ID or instance of editorconfig * ID or instance of editorconfig
@ -110,7 +117,17 @@ class HTMLEditorField extends TextareaField
public function getAttributes() public function getAttributes()
{ {
// Fix CSS height based on rows
$rowHeight = $this->config()->get('fixed_row_height');
$attributes = [];
if ($rowHeight) {
$height = $this->getRows() * $rowHeight;
$attributes['style'] = sprintf('height: %dpx;', $height);
}
// Merge attributes
return array_merge( return array_merge(
$attributes,
parent::getAttributes(), parent::getAttributes(),
$this->getEditorConfig()->getAttributes() $this->getEditorConfig()->getAttributes()
); );

1
src/Forms/HTMLEditor/TinyMCEConfig.php
View File

@ -332,7 +332,6 @@ class TinyMCEConfig extends HTMLEditorConfig
return [ return [
'data-editor' => 'tinyMCE', // Register ss.editorWrappers.tinyMCE 'data-editor' => 'tinyMCE', // Register ss.editorWrappers.tinyMCE
'data-config' => Convert::array2json($this->getConfig()), 'data-config' => Convert::array2json($this->getConfig()),
'style' => 'height:350px'
]; ];
} }

4
tests/php/Forms/HTMLEditor/TinyMCECombinedGeneratorTest.php
View File

@ -8,6 +8,7 @@ use SilverStripe\Dev\SapphireTest;
use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig; use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig;
use SilverStripe\Forms\HTMLEditor\TinyMCECombinedGenerator; use SilverStripe\Forms\HTMLEditor\TinyMCECombinedGenerator;
use SilverStripe\Forms\HTMLEditor\TinyMCEConfig; use SilverStripe\Forms\HTMLEditor\TinyMCEConfig;
use SilverStripe\View\SSViewer;
class TinyMCECombinedGeneratorTest extends SapphireTest class TinyMCECombinedGeneratorTest extends SapphireTest
{ {
@ -18,6 +19,7 @@ class TinyMCECombinedGeneratorTest extends SapphireTest
// Set custom base_path for tinymce // Set custom base_path for tinymce
Director::config()->set('alternate_base_folder', __DIR__ . '/TinyMCECombinedGeneratorTest'); Director::config()->set('alternate_base_folder', __DIR__ . '/TinyMCECombinedGeneratorTest');
Director::config()->set('alternate_base_url', 'http://www.mysite.com/basedir/'); Director::config()->set('alternate_base_url', 'http://www.mysite.com/basedir/');
SSViewer::config()->set('themes', [ SSViewer::DEFAULT_THEME ]);
TinyMCEConfig::config()->set('base_dir', 'tinymce'); TinyMCEConfig::config()->set('base_dir', 'tinymce');
} }
@ -45,7 +47,7 @@ class TinyMCECombinedGeneratorTest extends SapphireTest
/** @var TinyMCECombinedGenerator $generator */ /** @var TinyMCECombinedGenerator $generator */
$generator = Injector::inst()->create(TinyMCECombinedGenerator::class); $generator = Injector::inst()->create(TinyMCECombinedGenerator::class);
$this->assertEquals( $this->assertEquals(
'_tinymce/tinymce-testconfig-8d695fc0be.js', '_tinymce/tinymce-testconfig-6422b3814d.js',
$generator->generateFilename($c), $generator->generateFilename($c),
"Filename for config: " . json_encode($c->getAttributes()) . " should match expected value" "Filename for config: " . json_encode($c->getAttributes()) . " should match expected value"
); );