tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 14:18:46 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4707 from chillu/pulls/revert-formfield-extrafields

Browse Source 
Revert FormField->extraClass() inclusion of disabled/readonly
This commit is contained in:
Damian Mooyman 2015-10-27 10:12:43 +13:00
commit 7710edf412
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
forms/AssetField.php
View File

@ -476,6 +476,17 @@ class AssetField extends FileField {
return $this->setConfig('downloadTemplateName', $downloadTemplateName);
}
public function extraClass() {
if($this->isDisabled()) {
$this->addExtraClass('disabled');
}
if($this->isReadonly()) {
$this->addExtraClass('readonly');
}
return parent::extraClass();
}
public function Field($properties = array()) {
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');

10
forms/FormField.php
View File

@ -460,15 +460,7 @@ class FormField extends RequestHandler {
//
// CSS class needs to be different from the one rendered through {@link FieldHolder()}.
if($this->Message()) {
$classes[] = 'holder-' . $this->MessageType();
}
if($this->isDisabled()) {
$classes[] = 'disabled';
}
if($this->isReadonly()) {
$classes[] = 'readonly';
$classes[] .= 'holder-' . $this->MessageType();
}
return implode(' ', $classes);

11
forms/UploadField.php
View File

@ -912,6 +912,17 @@ class UploadField extends FileField {
);
}
public function extraClass() {
if($this->isDisabled()) {
$this->addExtraClass('disabled');
}
if($this->isReadonly()) {
$this->addExtraClass('readonly');
}
return parent::extraClass();
}
public function Field($properties = array()) {
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');