From b852a76334d17ea60a37456c972760ddaab5124c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 27 Apr 2017 11:47:04 +1200 Subject: [PATCH] Consistent schema keys --- src/Forms/DateField.php | 6 +++++- src/Forms/DatetimeField.php | 7 ++++++- src/Forms/TimeField.php | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Forms/DateField.php b/src/Forms/DateField.php index dd86aed6f..33e4a9c22 100644 --- a/src/Forms/DateField.php +++ b/src/Forms/DateField.php @@ -295,7 +295,11 @@ class DateField extends TextField $defaults = parent::getSchemaDataDefaults(); return array_merge($defaults, [ 'lang' => i18n::convert_rfc1766($this->getLocale()), - 'html5' => $this->getHTML5() + 'data' => array_merge($defaults['data'], [ + 'html5' => $this->getHTML5(), + 'min' => $this->getMinDate(), + 'max' => $this->getMaxDate() + ]) ]); } diff --git a/src/Forms/DatetimeField.php b/src/Forms/DatetimeField.php index 836a3ae82..9003b4f58 100644 --- a/src/Forms/DatetimeField.php +++ b/src/Forms/DatetimeField.php @@ -111,7 +111,12 @@ class DatetimeField extends TextField { $defaults = parent::getSchemaDataDefaults(); return array_merge($defaults, [ - 'html5' => $this->getHTML5() + 'lang' => i18n::convert_rfc1766($this->getLocale()), + 'data' => array_merge($defaults['data'], [ + 'html5' => $this->getHTML5(), + 'min' => $this->getMinDate(), + 'max' => $this->getMaxDate() + ]) ]); } diff --git a/src/Forms/TimeField.php b/src/Forms/TimeField.php index 26085cb6a..ff430031b 100644 --- a/src/Forms/TimeField.php +++ b/src/Forms/TimeField.php @@ -235,7 +235,10 @@ class TimeField extends TextField { $defaults = parent::getSchemaDataDefaults(); return array_merge($defaults, [ - 'html5' => $this->getHTML5() + 'lang' => i18n::convert_rfc1766($this->getLocale()), + 'data' => array_merge($defaults['data'], [ + 'html5' => $this->getHTML5(), + ]) ]); }