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

MINOR Optional dependency on ThumbnailStripField in HtmlEditorField, preparing the split of this field into a "basic" and "cms" version

Browse Source
This commit is contained in:
Ingo Schommer 2011-03-23 15:38:31 +13:00
parent 41e51abd9a
commit 67cc18f5bf
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forms/HtmlEditorField.php
View File

@ -288,6 +288,10 @@ class HtmlEditorField_Toolbar extends RequestHandler {
* @return Form
*/
function ImageForm() {
if(!class_exists('ThumbnailStripField')) {
throw new Exception('ThumbnailStripField class required for HtmlEditorField->ImageForm()');
}
$fields = new FieldSet(
new LiteralField(
'Heading',
@ -348,6 +352,10 @@ class HtmlEditorField_Toolbar extends RequestHandler {
}
function FlashForm() {
if(!class_exists('ThumbnailStripField')) {
throw new Exception('ThumbnailStripField class required for HtmlEditorField->FlashForm()');
}
$form = new Form(
$this->controller,
"{$this->name}/FlashForm",

15
tests/forms/HtmlEditorFieldTest.php
View File

@ -77,13 +77,18 @@ class HtmlEditorFieldTest extends FunctionalTest {
}
public function testExtendImageFormFields() {
$controller = new Controller();
if(class_exists('ThumbnailStripField')) {
$controller = new Controller();
$toolbar = new HtmlEditorField_Toolbar($controller, 'DummyToolbar');
$toolbar = new HtmlEditorField_Toolbar($controller, 'DummyToolbar');
$imageForm = $toolbar->ImageForm();
$this->assertTrue(HtmlEditorFieldTest_DummyImageFormFieldExtension::$update_called);
$this->assertEquals($imageForm->Fields(), HtmlEditorFieldTest_DummyImageFormFieldExtension::$fields);
$imageForm = $toolbar->ImageForm();
$this->assertTrue(HtmlEditorFieldTest_DummyImageFormFieldExtension::$update_called);
$this->assertEquals($imageForm->Fields(), HtmlEditorFieldTest_DummyImageFormFieldExtension::$fields);
} else {
$this->markTestSkipped('Test requires cms module (ThumbnailStripfield class)');
}
}
}