Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

decrementMinute - added round to next step for when initial value is not a multiple of the step. #324

Open
wants to merge 3 commits into
base: gh-pages
Choose a base branch
from
+66 −1
Open

decrementMinute - added round to next step for when initial value is not a multiple of the step. #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f814af6
Update bootstrap-timepicker.js
smistir Jan 8, 2016
8aa2729
Update TimepickerSpec.js
smistir Jan 13, 2016
111e1ee
Update TimepickerSpec.js
smistir Jan 13, 2016
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
7 changes: 6 additions & 1 deletion js/bootstrap-timepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,12 @@
if (step) {
newVal = this.minute - step;
} else {
newVal = this.minute - this.minuteStep;
if(this.minuteStep > 0 && (this.minute % this.minuteStep) > 0) {
newVal = this.minute - (this.minute % this.minuteStep);
}
else {
newVal = this.minute - this.minuteStep;
}
}

if (newVal < 0) {
Expand Down
60 changes: 60 additions & 0 deletions spec/js/TimepickerSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,36 @@ describe('Timepicker feature', function() {
expect(tp2.minute).toBe(30);
});

it('should increment minutes with incrementMinute method using Step and Rounding when initial value is not a Multiple of the Step', function () {
expect(tp1).toBeDefined();
expect(tp1.minuteStep).toBe(15);

tp1.setTime('11:00'); //Quick test to verify expected results
var currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:00 AM');

tp1.incrementMinute();
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:15 AM');

tp1.setTime('11:02'); //Setup test with a time that is not a multiple of step
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:02 AM');

tp1.incrementMinute();
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:15 AM');

tp1.incrementMinute(); //After the first rounded-increment, make sure further increments follow step
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:30 AM');
});

it('should decrement minutes with decrementMinute method', function() {
tp1.hour = 11;
tp1.minute = 0;
Expand All @@ -429,6 +459,36 @@ describe('Timepicker feature', function() {
expect(tp2.minute).toBe(30);
});

it('should decrement minutes with decrementMinute method using Step and Rounding when initial value is not a Multiple of the Step', function () {
expect(tp1).toBeDefined();
expect(tp1.minuteStep).toBe(15);

tp1.setTime('11:00'); //Quick test to verify expected results
var currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:00 AM');

tp1.decrementMinute();
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('10:45 AM');

tp1.setTime('11:02'); //Setup test with a time that is not a multiple of step
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:02 AM');

tp1.decrementMinute();
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('11:00 AM');

tp1.decrementMinute(); //After the first rounded-decrement, make sure further decrements follow step
currentTime = tp1.getTime();
expect(currentTime).toBeDefined();
expect(currentTime).toBe('10:45 AM');
});

it('should increment hour if minutes increment past 59', function() {
$input1.val('11:55 AM');
tp1.updateFromElementVal();
Expand Down