Merge pull request #12 from iPublikuj/revert-4-master

Revert "Wrong settings datatype"
ipublikuj-archive · Mar 27, 2019 · f4dd0f6 · f4dd0f6
2 parents 5f420ed + 0278302
commit f4dd0f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/IPub/FormDateTime/Controls/Date.php b/src/IPub/FormDateTime/Controls/Date.php
@@ -316,7 +316,6 @@ public function getControl()
 	 */
 	public function getControlPart()
 	{
-
 		$args = func_get_args();
 		$key = reset($args);
 

diff --git a/src/IPub/FormDateTime/Controls/DateTime.php b/src/IPub/FormDateTime/Controls/DateTime.php
@@ -173,9 +173,9 @@ protected function getControlSettings()
 			// The time format, combination of p, P, h, hh, i, ii, s, ss, d, dd, m, mm, M, MM, yy, yyyy
 			'format'				=> $this->timeFormat,
 			// Enable or disable meridian views
-			'showMeridian'			=> $this->showMeridian ? true : false,
+			'showMeridian'			=> $this->showMeridian ? 'true' : 'false',
 			// Whether or not to close the date picker immediately when a date is selected
-			'autoclose'				=> $this->autoclose ? true : false,
+			'autoclose'				=> $this->autoclose ? 'true' : 'false',
 			// The lowest view that the date picker should show
 			'startView'				=> self::START_VIEW_DAY,
 			// The lowest view that the date picker should show

diff --git a/src/IPub/FormDateTime/Controls/Time.php b/src/IPub/FormDateTime/Controls/Time.php
@@ -179,9 +179,9 @@ protected function getControlSettings()
 				// The time format, combination of p, P, h, hh, i, ii, s, ss, d, dd, m, mm, M, MM, yy, yyyy
 				'format'				=> $this->timeFormat,
 				// Enable or disable meridian views
-				'showMeridian'			=> $this->showMeridian ? true : false,
+				'showMeridian'			=> $this->showMeridian ? 'true' : 'false',
 				// Whether or not to close the date picker immediately when a date is selected
-				'autoclose'				=> $this->autoclose ? true : false,
+				'autoclose'				=> $this->autoclose ? 'true' : 'false',
 				// The lowest view that the date picker should show
 				'startView'				=> self::START_VIEW_HOUR,
 				// The lowest view that the date picker should show