fix(timepicker): need keep source date (#UIM-79) (#176)

positive-js · Jul 18, 2019 · 9ba7050 · 9ba7050
1 parent 0e5e3b0
commit 9ba7050
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 94 deletions.
diff --git a/packages/mosaic-dev/timepicker/module.ts b/packages/mosaic-dev/timepicker/module.ts
@@ -33,7 +33,7 @@ const moment = _rollupMoment || _moment;
     encapsulation: ViewEncapsulation.None
 })
 export class TimepickerDemoComponent {
-    timeValue1: Moment = moment();
+    timeValue: Moment = moment('2000-10-01 12:00:00');
     isDisabled: boolean = false;
 
     toggleDisable() {

diff --git a/packages/mosaic-dev/timepicker/template.html b/packages/mosaic-dev/timepicker/template.html
@@ -20,7 +20,7 @@ <h3 class="mc-title">Example 1</h3>
         <mc-form-field >
             <i mcPrefix mc-icon="mc-clock_16" color="second"></i>
             <input mcTimepicker
-                   [(ngModel)]="timeValue1"
+                   [(ngModel)]="timeValue"
                    time-format="HH:mm:ss"
                    min-time="10:00:00"
                    max-time="13:30:00"
@@ -30,14 +30,14 @@ <h3 class="mc-title">Example 1</h3>
 
     <br>
 
-    <p class="mc-caption_mono" *ngIf="timeValue1 !== null">
+    <p class="mc-caption_mono" *ngIf="timeValue !== null">
         Current time value:
-        {{timeValue1.hours()}}:
-        {{timeValue1.minutes()}}:
-        {{timeValue1.seconds()}}
+        {{timeValue.hours()}}:
+        {{timeValue.minutes()}}:
+        {{timeValue.seconds()}}
     </p>
 
-    <p class="mc-caption_mono" *ngIf="timeValue1 === null"> Incorrect input - null result</p>
+    <p class="mc-caption_mono" *ngIf="timeValue === null"> Incorrect input - null result</p>
 
     <br>
 

diff --git a/packages/mosaic-moment-adapter/adapter/moment-date-adapter.ts b/packages/mosaic-moment-adapter/adapter/moment-date-adapter.ts
@@ -227,8 +227,9 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
         return result;
     }
 
-    createDateTime(year: number, month: number, date: number,
-                   hours: number, minutes: number, seconds: number, milliseconds: number): Moment {
+    createDateTime(
+        year: number, month: number, date: number, hours: number, minutes: number, seconds: number, milliseconds: number
+    ): Moment {
         const newDate = this.createDate(year, month, date);
 
         newDate.hours(hours);