[Fmsystem-commits] [16574] initial value

[sigurdne]

Revision: 16574
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16574
Author:   sigurdne
Date:     2017-04-11 12:08:20 -0400 (Tue, 11 Apr 2017)
Log Message:
-----------
initial value

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.jqcal2.inc.php

Modified: trunk/phpgwapi/inc/class.jqcal2.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jqcal2.inc.php     2017-04-11 16:07:35 UTC (rev 
16573)
+++ trunk/phpgwapi/inc/class.jqcal2.inc.php     2017-04-11 16:08:20 UTC (rev 
16574)
@@ -65,7 +65,7 @@
                        }
                        else
                        {
-                               $start_value = '';
+                               $start_value = $dateformat == 'H:i' ? $value : 
'';
                        }
                        $this->_input_modern($name, $_type, $dateformat, 
$config, $start_value);
                        return "<input id='{$name}' type='text' 
value='{$value}' size='10' name='{$name}'/>";
@@ -98,6 +98,7 @@
                                $min_date .= ",maxDate:'{$config['max_date']}'";
                        }
 
+                       $value = 'false';
                        if(!$start_value)
                        {
                                $start_value = 'new Date()';
@@ -104,7 +105,15 @@
                        }
                        else
                        {
-                               $start_value = "new Date('{$start_value}')";
+                               if($datepicker)
+                               {
+                                       $start_value = "new 
Date('{$start_value}')";
+                               }
+                               else if($timepicker)
+                               {
+                                       $value = $start_value ? 
"'{$start_value}'" : 'false';
+                                       $start_value = 'false';
+                               }
                        }
 
 
@@ -121,6 +130,7 @@
                                        datepicker:{$datepicker},
                                        timepicker: {$timepicker},
                                        step: 15,
+                                       value: {$value},
                                        weeks: true,
                                        dayOfWeekStart:1,
 //                                     mask:true,