Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
589273e
feat(time-picker): add support second
Aug 30, 2019
3aab8e5
Merge branch 'master' of https://github.com/Tian-Hun/igniteui-angular
Aug 30, 2019
f9334d8
feat(time-picker): amend README.md and spect.ts
Aug 30, 2019
d6fd730
Merge branch 'master' into master
kdinev Aug 30, 2019
b5557c8
Merge branch 'master' into master
kdinev Sep 25, 2019
32c2f1d
fix(time-picker): fix select seconds bugs
Sep 26, 2019
20d8064
Merge branch 'master' of https://github.com/Tian-Hun/igniteui-angular
Sep 26, 2019
d15b09d
Merge branch 'master' into master
kdinev Oct 2, 2019
ad46773
Merge branch 'master' into master
jackofdiamond5 Dec 4, 2019
9cb69a1
Merge branch 'master' into master
kdinev Dec 4, 2019
9f4b39a
refactor(time-picker): dynamically generate possible cursor positions
jackofdiamond5 Dec 6, 2019
1c042df
refactor(time-picker): update test components to work with seconds fe…
jackofdiamond5 Dec 6, 2019
aeed033
Merge branch 'master' of https://github.com/Tian-Hun/igniteui-angular
jackofdiamond5 Dec 6, 2019
eea0737
Merge branch 'master' into master
jackofdiamond5 Dec 6, 2019
4d22fbf
Merge branch 'master' of https://github.com/Tian-Hun/igniteui-angular
jackofdiamond5 Dec 6, 2019
b813e5b
Merge branch 'master' into master
jackofdiamond5 Dec 9, 2019
642cb8a
Merge branch 'master' into master
jackofdiamond5 Dec 10, 2019
4e3ddc5
refactor(time-picker): determine mask parts
jackofdiamond5 Dec 10, 2019
2de73d1
Merge branch 'master' of https://github.com/Tian-Hun/igniteui-angular
jackofdiamond5 Dec 10, 2019
005bda4
refactor(time-picker): move logic for cursor positioning to separate …
jackofdiamond5 Dec 10, 2019
0f3bde2
refactor(time-picker): remove unneeded function;
jackofdiamond5 Dec 10, 2019
1592b34
chore(time-picker): update isSpinLoop comment
jackofdiamond5 Dec 11, 2019
3845658
Merge branch 'master' into master
jackofdiamond5 Dec 12, 2019
47b9d86
Merge branch 'master' into master
jackofdiamond5 Dec 12, 2019
94d8570
Merge branch 'master' into master
jackofdiamond5 Dec 12, 2019
bef84aa
Merge branch 'master' into master
Lipata Dec 13, 2019
96478ed
Merge branch 'master' into master
Lipata Dec 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
@extend %time-picker__minuteList !optional;
}

// SECONDS
@include e(secondsList) {
@extend %time-picker__secondsList !optional;
}

// AM PM
@include e(ampmList) {
@extend %time-picker__ampmList !optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@
}
}

%time-picker__secondsList {
text-align: center;
}

%time-picker__ampmList {
display: flex;
flex-direction: column;
Expand Down
2 changes: 2 additions & 0 deletions projects/igniteui-angular/src/lib/time-picker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ List of time-flags:
"HH": hours field in 24-hours format with leading zero
"m": minutes field without leading zero
"mm": minutes field with leading zero
"s": seconds field without leading zero
"ss": seconds field with leading zero
"tt": 2 characters of string which represents AM/PM field |
| `isSpinLoop` | boolean | Determines the spin behavior. By default `isSpinLoop` is set to true. |
| `mode` | InteractionMode | Determines the interaction mode - a dialog picker or a dropdown with editable masked input. Default is dialog picker.|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,33 @@ export const IGX_TIME_PICKER_COMPONENT = 'IgxTimePickerComponentToken';
export interface IgxTimePickerBase {
hourList: ElementRef;
minuteList: ElementRef;
secondsList: ElementRef;
ampmList: ElementRef;
selectedHour: string;
selectedMinute: string;
selectedSeconds: string;
selectedAmPm: string;
format: string;
promptChar: string;
cleared: boolean;
mode: InteractionMode;
showHoursList: boolean;
showMinutesList: boolean;
showSecondsList: boolean;
showAmPmList: boolean;
nextHour();
prevHour();
nextMinute();
prevMinute();
nextSeconds();
prevSeconds();
nextAmPm();
prevAmPm();
okButtonClick(): boolean;
cancelButtonClick(): void;
scrollHourIntoView(item: string): void;
scrollMinuteIntoView(item: string): void;
scrollSecondsIntoView(item: string): void;
scrollAmPmIntoView(item: string): void;
close(): void;
parseMask(preserveAmPm?: boolean): string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div *ngIf="mode === 'dialog'" class="igx-time-picker__header">
<h5 class="igx-time-picker__header-ampm">{{ selectedAmPm }}</h5>
<h2 class="igx-time-picker__header-hour">
<span>{{ selectedHour }}</span>:<span>{{ selectedMinute }}</span>
<span>{{ selectedHour }}</span>:<span>{{ selectedMinute }}</span>:<span>{{ selectedSeconds }}</span>
</h2>
</div>
<div class="igx-time-picker__main">
Expand All @@ -50,10 +50,15 @@ <h2 class="igx-time-picker__header-hour">
<div *ngIf="showMinutesList" #minuteList [igxItemList]="'minuteList'">
<span [igxMinuteItem]="minute" *ngFor="let minute of minuteView">{{ minute }}</span>
</div>
<div *ngIf="showSecondsList" #secondsList [igxItemList]="'secondsList'">
<span [igxSecondsItem]="seconds" *ngFor="let seconds of secondsView">{{ seconds }}</span>
</div>
<div *ngIf="showAmPmList" #ampmList [igxItemList]="'ampmList'">
<span [igxAmPmItem]="ampm" *ngFor="let ampm of ampmView">{{ ampm }}</span>
</div>
</div>
<ng-container *ngTemplateOutlet="timePickerActionsDirective ? timePickerActionsDirective.template : defaultTimePickerActions"></ng-container>
<ng-container
*ngTemplateOutlet="timePickerActionsDirective ? timePickerActionsDirective.template : defaultTimePickerActions">
</ng-container>
</div>
</div>
</div>
Loading