added 'value' option for setting value of timepicker to value of element

jdewit · May 9, 2012 · af8619f · af8619f
1 parent 37ee91f
commit af8619f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js
@@ -117,6 +117,7 @@
             if (match) {
                 meridian = match[1];
             }
+            // .split(/^([0-9]+):([0-9]+) (AM|PM)$/)
             time = $.trim(time.replace(/(PM|AM)/i, ''));
             var timeArray = time.split(':');
 
@@ -132,7 +133,7 @@
                     var hours = dTime.getHours();
                     var minutes = Math.floor(dTime.getMinutes() / this.minuteStep) * this.minuteStep;
                     var meridian = "AM";
-                    if ( this.showMeridian ){
+                    if ( this.showMeridian ) {
                         if (hours === 0) {
                             hours = 12;
                         } else if (hours > 12) {
@@ -145,6 +146,8 @@
                     this.hour = hours;
                     this.minute = minutes;
                     this.meridian = meridian;
+                } else if (defaultTime === 'value') {
+                    this.setValues( this.$element.val() );
                 } else {
                     this.setValues(defaultTime);
                 }