Skip to content

Commit f3ee6a1

Browse files
PlamenaMitevaPlamenaMiteva
committed
chore(time-picker): fix itemsDeltas
1 parent 84586a1 commit f3ee6a1

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎projects/igniteui-angular/src/lib/time-picker/time-picker.common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface IgxTimePickerBase {
1212
ampmList: ElementRef;
1313
inputFormat: string;
1414
itemsDelta: Pick<DatePartDeltas, 'hours' | 'minutes' | 'seconds'>;
15-
spinLoop: boolen;
15+
spinLoop: boolean;
1616
selectedDate: Date;
1717
maxDropdownValue: Date;
1818
minDropdownValue: Date;

‎projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -923,8 +923,8 @@ export class IgxTimePickerComponent extends PickerBaseDirective
923923
let minutes = this._selectedDate.getMinutes();
924924
const minMinutes = hours === minHours ? this.minDropdownValue.getMinutes() : 0;
925925
const maxMinutes = hours === maxHours ? this.maxDropdownValue.getMinutes() :
926-
minutes % this.itemsDelta.minute > 0 ? 60 - (minutes % this.itemsDelta.minute) :
927-
60 - this.itemsDelta.minute;
926+
minutes % this.itemsDelta.minutes > 0 ? 60 - (minutes % this.itemsDelta.minutes) :
927+
60 - this.itemsDelta.minutes;
928928

929929
if ((delta < 0 && minutes === minMinutes) || (delta > 0 && minutes === maxMinutes)) {
930930
minutes = this.spinLoop && minutes === minMinutes ? maxMinutes : this.spinLoop && minutes === maxMinutes ? minMinutes : minutes;
@@ -950,8 +950,8 @@ export class IgxTimePickerComponent extends PickerBaseDirective
950950
let seconds = this._selectedDate.getSeconds();
951951
const minSeconds = (hours === minHours && minutes === minMinutes) ? this.minDropdownValue.getSeconds() : 0;
952952
const maxSeconds = (hours === maxHours && minutes === maxMinutes) ? this.maxDropdownValue.getSeconds() :
953-
seconds % this.itemsDelta.second > 0 ? 60 - (seconds % this.itemsDelta.second) :
954-
60 - this.itemsDelta.second;
953+
seconds % this.itemsDelta.seconds > 0 ? 60 - (seconds % this.itemsDelta.seconds) :
954+
60 - this.itemsDelta.seconds;
955955

956956
if ((delta < 0 && seconds === minSeconds) || (delta > 0 && seconds === maxSeconds)) {
957957
seconds = this.spinLoop && seconds === minSeconds ? maxSeconds : this.spinLoop && seconds === maxSeconds ? minSeconds : seconds;
@@ -1081,25 +1081,25 @@ export class IgxTimePickerComponent extends PickerBaseDirective
10811081
return;
10821082
}
10831083

1084-
if (this._selectedDate.getHours() % this.itemsDelta.hour > 0) {
1084+
if (this._selectedDate.getHours() % this.itemsDelta.hours > 0) {
10851085
this._selectedDate.setHours(
1086-
this._selectedDate.getHours() + this.itemsDelta.hour - this._selectedDate.getHours() % this.itemsDelta.hour,
1086+
this._selectedDate.getHours() + this.itemsDelta.hours - this._selectedDate.getHours() % this.itemsDelta.hours,
10871087
0,
10881088
0
10891089
);
10901090
}
10911091

1092-
if (this._selectedDate.getMinutes() % this.itemsDelta.minute > 0) {
1092+
if (this._selectedDate.getMinutes() % this.itemsDelta.minutes > 0) {
10931093
this._selectedDate.setHours(
10941094
this._selectedDate.getHours(),
1095-
this._selectedDate.getMinutes() + this.itemsDelta.minute - this._selectedDate.getMinutes() % this.itemsDelta.minute,
1095+
this._selectedDate.getMinutes() + this.itemsDelta.minutes - this._selectedDate.getMinutes() % this.itemsDelta.minutes,
10961096
0
10971097
);
10981098
}
10991099

1100-
if (this._selectedDate.getSeconds() % this.itemsDelta.second > 0) {
1100+
if (this._selectedDate.getSeconds() % this.itemsDelta.seconds > 0) {
11011101
this._selectedDate.setSeconds(
1102-
this._selectedDate.getSeconds() + this.itemsDelta.second - this._selectedDate.getSeconds() % this.itemsDelta.second
1102+
this._selectedDate.getSeconds() + this.itemsDelta.seconds - this._selectedDate.getSeconds() % this.itemsDelta.seconds
11031103
);
11041104
}
11051105
}

‎projects/igniteui-angular/src/lib/time-picker/time-picker.pipes.ts‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,26 @@ export class TimeItemPipe implements PipeTransform {
6969
let minutes = time.getMinutes();
7070
let seconds = time.getSeconds();
7171

72-
if (this.timePicker.showHoursList && hours % this.timePicker.itemsDelta.hour > 0) {
73-
delta = value === 'min' ? this.timePicker.itemsDelta.hour - hours % this.timePicker.itemsDelta.hour
74-
: hours % this.timePicker.itemsDelta.hour;
72+
if (this.timePicker.showHoursList && hours % this.timePicker.itemsDelta.hours > 0) {
73+
delta = value === 'min' ? this.timePicker.itemsDelta.hours - hours % this.timePicker.itemsDelta.hours
74+
: hours % this.timePicker.itemsDelta.hours;
7575
minutes = value === 'min' ? 0
76-
: 60 % this.timePicker.itemsDelta.minute > 0 ? 60 - 60 % this.timePicker.itemsDelta.minute
77-
: 60 - this.timePicker.itemsDelta.minute;
76+
: 60 % this.timePicker.itemsDelta.minutes > 0 ? 60 - 60 % this.timePicker.itemsDelta.minutes
77+
: 60 - this.timePicker.itemsDelta.minutes;
7878
seconds = value === 'min' ? 0
79-
: 60 % this.timePicker.itemsDelta.second > 0 ? 60 - 60 % this.timePicker.itemsDelta.second
80-
: 60 - this.timePicker.itemsDelta.second;
79+
: 60 % this.timePicker.itemsDelta.seconds > 0 ? 60 - 60 % this.timePicker.itemsDelta.seconds
80+
: 60 - this.timePicker.itemsDelta.seconds;
8181
time.setHours(hours + sign * delta, minutes, seconds);
82-
} else if (this.timePicker.showMinutesList && minutes % this.timePicker.itemsDelta.minute > 0) {
83-
delta = value === 'min' ? this.timePicker.itemsDelta.minute - minutes % this.timePicker.itemsDelta.minute
84-
: minutes % this.timePicker.itemsDelta.minute;
82+
} else if (this.timePicker.showMinutesList && minutes % this.timePicker.itemsDelta.minutes > 0) {
83+
delta = value === 'min' ? this.timePicker.itemsDelta.minutes - minutes % this.timePicker.itemsDelta.minutes
84+
: minutes % this.timePicker.itemsDelta.minutes;
8585
seconds = value === 'min' ? 0
86-
: 60 % this.timePicker.itemsDelta.second > 0 ? 60 - 60 % this.timePicker.itemsDelta.second
87-
: 60 - this.timePicker.itemsDelta.second;
86+
: 60 % this.timePicker.itemsDelta.seconds > 0 ? 60 - 60 % this.timePicker.itemsDelta.seconds
87+
: 60 - this.timePicker.itemsDelta.seconds;
8888
time.setHours(hours, minutes + sign * delta, seconds);
89-
} else if (this.timePicker.showSecondsList && seconds % this.timePicker.itemsDelta.second > 0) {
90-
delta = value === 'min' ? this.timePicker.itemsDelta.second - seconds % this.timePicker.itemsDelta.second
91-
: seconds % this.timePicker.itemsDelta.second;
89+
} else if (this.timePicker.showSecondsList && seconds % this.timePicker.itemsDelta.seconds > 0) {
90+
delta = value === 'min' ? this.timePicker.itemsDelta.seconds - seconds % this.timePicker.itemsDelta.seconds
91+
: seconds % this.timePicker.itemsDelta.seconds;
9292
time.setHours(hours, minutes, seconds + sign * delta);
9393
}
9494

@@ -111,9 +111,9 @@ export class TimeItemPipe implements PipeTransform {
111111
const leadZeroSeconds = (item < 10 && this.timePicker.inputFormat.indexOf('ss') !== -1);
112112

113113
const leadZero = {
114-
hour: leadZeroHour,
115-
minute: leadZeroMinute,
116-
second: leadZeroSeconds
114+
hours: leadZeroHour,
115+
minutes: leadZeroMinute,
116+
seconds: leadZeroSeconds
117117
}[dateType];
118118

119119
item = (leadZero) ? '0' + item : `${item}`;
@@ -142,13 +142,13 @@ export class TimeItemPipe implements PipeTransform {
142142
private generateHours(): any[] {
143143
const hourItems = [];
144144
let hoursCount = this.timePicker.isTwelveHourFormat ? 13 : 24;
145-
hoursCount /= this.timePicker.itemsDelta.hour;
145+
hoursCount /= this.timePicker.itemsDelta.hours;
146146
const minHours = this.timePicker.minDropdownValue.getHours();
147147
const maxHours = this.timePicker.maxDropdownValue.getHours();
148148

149149
if (hoursCount > 1) {
150150
for (let hourIndex = 0; hourIndex < 24; hourIndex++) {
151-
let hours = hourIndex * this.timePicker.itemsDelta.hour;
151+
let hours = hourIndex * this.timePicker.itemsDelta.hours;
152152
if (hours >= minHours && hours <= maxHours) {
153153
hours = this.timePicker.isTwelveHourFormat ? this.toTwelveHourFormat(hours) : hours;
154154
if (!hourItems.find((element => element === hours))) {
@@ -172,14 +172,14 @@ export class TimeItemPipe implements PipeTransform {
172172

173173
private generateMinutes(): any[] {
174174
const minuteItems = [];
175-
const minuteItemsCount = 60 / this.timePicker.itemsDelta.minute;
175+
const minuteItemsCount = 60 / this.timePicker.itemsDelta.minutes;
176176
const time = new Date(this.timePicker.selectedDate);
177177

178178
for (let i = 0; i < minuteItemsCount; i++) {
179-
const minutes = i * this.timePicker.itemsDelta.minute;
179+
const minutes = i * this.timePicker.itemsDelta.minutes;
180180
time.setMinutes(minutes);
181181
if (time.getTime() >= this.timePicker.minDropdownValue.getTime() && time.getTime() <= this.timePicker.maxDropdownValue.getTime()) {
182-
minuteItems.push(i * this.timePicker.itemsDelta.minute);
182+
minuteItems.push(i * this.timePicker.itemsDelta.minutes);
183183
}
184184
}
185185

@@ -195,14 +195,14 @@ export class TimeItemPipe implements PipeTransform {
195195

196196
private generateSeconds(): any[] {
197197
const secondsItems = [];
198-
const secondsItemsCount = 60 / this.timePicker.itemsDelta.second;
198+
const secondsItemsCount = 60 / this.timePicker.itemsDelta.seconds;
199199
const time = new Date(this.timePicker.selectedDate);
200200

201201
for (let i = 0; i < secondsItemsCount; i++) {
202-
const seconds = i * this.timePicker.itemsDelta.second;
202+
const seconds = i * this.timePicker.itemsDelta.seconds;
203203
time.setSeconds(seconds);
204204
if (time.getTime() >= this.timePicker.minDropdownValue.getTime() && time.getTime() <= this.timePicker.maxDropdownValue.getTime()) {
205-
secondsItems.push(i * this.timePicker.itemsDelta.second);
205+
secondsItems.push(i * this.timePicker.itemsDelta.seconds);
206206
}
207207
}
208208

0 commit comments

Comments
 (0)