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

Merge pull request #3361 from halkyon/number_type_numericfield

Browse Source 
API Use "number" HTML5 type for NumericField by default
This commit is contained in:
Hamish Friedlander 2014-08-04 16:02:13 +12:00
commit ca68f585cc
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/changelogs/3.2.0.md
View File

@ -6,6 +6,7 @@
* Minimum PHP version raised to 5.3.3 * Minimum PHP version raised to 5.3.3
* DataObject::validate() method visibility changed to public * DataObject::validate() method visibility changed to public
* NumericField now uses HTML5 "number" type instead of "text"
* UploadField "Select from files" shows files in all folders by default * UploadField "Select from files" shows files in all folders by default
* UploadField won't display an overwrite warning unless Upload:replaceFile is true * UploadField won't display an overwrite warning unless Upload:replaceFile is true
* HtmlEditorField no longer substitutes `<blockquote />` for indented text * HtmlEditorField no longer substitutes `<blockquote />` for indented text

7
forms/NumericField.php
View File

@ -13,6 +13,13 @@ class NumericField extends TextField {
return 'numeric text'; return 'numeric text';
} }
public function getAttributes() {
return array_merge(parent::getAttributes(), array(
'type' => 'number',
'step' => 'any' // allows entering float/decimal numbers like "1.2" instead of just integers
));
}
public function validate($validator) { public function validate($validator) {
if(!$this->value && !$validator->fieldIsRequired($this->name)) { if(!$this->value && !$validator->fieldIsRequired($this->name)) {
return true; return true;

9
tests/forms/NumericFieldTest.php
View File

@ -34,4 +34,13 @@ class NumericFieldTest extends SapphireTest {
$field->setValue('12.00'); $field->setValue('12.00');
$this->assertFalse($field->validate($validator)); $this->assertFalse($field->validate($validator));
} }
public function testNumberTypeOnInputHtml() {
$field = new NumericField('Number');
$html = $field->Field();
$this->assertContains('type="number"', $html, 'number type set');
$this->assertContains('step="any"', $html, 'step value set to any');
}
} }