diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Form] Changed "allow_html5" to "html5"

Browse Source
This commit is contained in:
Bernhard Schussek 2014-09-23 12:15:17 +02:00
parent 0050b8d458
commit ad171be6e9
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Form/CHANGELOG.md
View File

@ -4,7 +4,7 @@ CHANGELOG
2.6.0
-----
* added "allow_html5" option to Date, Time and DateTimeFormType to be able to
* added "html5" option to Date, Time and DateTimeFormType to be able to
enable/disable HTML5 input date when widget option is "single_text"
2.5.0

10
src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View File

@ -117,7 +117,7 @@ class DateTimeType extends AbstractType
'empty_value',
'required',
'translation_domain',
'allow_html5',
'html5',
)));
$timeOptions = array_intersect_key($options, array_flip(array(
@ -129,7 +129,7 @@ class DateTimeType extends AbstractType
'empty_value',
'required',
'translation_domain',
'allow_html5',
'html5',
)));
if (null !== $options['date_widget']) {
@ -185,8 +185,8 @@ class DateTimeType extends AbstractType
// Change the input to a HTML5 datetime input if
// * the widget is set to "single_text"
// * the format matches the one expected by HTML5
// * the allow_html5 is set to true
if ($options['allow_html5'] && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
// * the html5 is set to true
if ($options['html5'] && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
$view->vars['type'] = 'datetime';
}
}
@ -221,7 +221,7 @@ class DateTimeType extends AbstractType
'time_widget' => $timeWidget,
'with_minutes' => true,
'with_seconds' => false,
'allow_html5' => true,
'html5' => true,
// Don't modify \DateTime classes by reference, we treat
// them like immutable value objects
'by_reference' => false,

6
src/Symfony/Component/Form/Extension/Core/Type/DateType.php
View File

@ -136,8 +136,8 @@ class DateType extends AbstractType
// Change the input to a HTML5 date input if
// * the widget is set to "single_text"
// * the format matches the one expected by HTML5
// * the allow_html5 is set to true
if ($options['allow_html5'] && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
// * the html5 is set to true
if ($options['html5'] && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
$view->vars['type'] = 'date';
}
@ -206,7 +206,7 @@ class DateType extends AbstractType
'model_timezone' => null,
'view_timezone' => null,
'empty_value' => $emptyValue,
'allow_html5' => true,
'html5' => true,
// Don't modify \DateTime classes by reference, we treat
// them like immutable value objects
'by_reference' => false,

6
src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
View File

@ -140,8 +140,8 @@ class TimeType extends AbstractType
// Change the input to a HTML5 time input if
// * the widget is set to "single_text"
// * the allow_html5 is set to true
if ($options['allow_html5'] && 'single_text' === $options['widget']) {
// * the html5 is set to true
if ($options['html5'] && 'single_text' === $options['widget']) {
$view->vars['type'] = 'time';
// we need to force the browser to display the seconds by
@ -195,7 +195,7 @@ class TimeType extends AbstractType
'model_timezone' => null,
'view_timezone' => null,
'empty_value' => $emptyValue,
'allow_html5' => true,
'html5' => true,
// Don't modify \DateTime classes by reference, we treat
// them like immutable value objects
'by_reference' => false,

2
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
View File

@ -409,7 +409,7 @@ class DateTimeTypeTest extends TypeTestCase
{
$form = $this->factory->create('datetime', null, array(
'widget' => 'single_text',
'allow_html5' => false,
'html5' => false,
));
$view = $form->createView();

2
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
View File

@ -709,7 +709,7 @@ class DateTypeTest extends TypeTestCase
{
$form = $this->factory->create('date', null, array(
'widget' => 'single_text',
'allow_html5' => false,
'html5' => false,
));
$view = $form->createView();

2
src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
View File

@ -523,7 +523,7 @@ class TimeTypeTest extends TypeTestCase
{
$form = $this->factory->create('time', null, array(
'widget' => 'single_text',
'allow_html5' => false,
'html5' => false,
));
$view = $form->createView();