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

Ability to add minute step greater than 60 #313

Open
wants to merge 4 commits into
base: gh-pages
Choose a base branch
from
Open

Ability to add minute step greater than 60 #313

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0bb0af
Add minutes step greater than 60
ibrahimabdo Dec 7, 2015
54d1cf0
Add minutes step greater than 60
ibrahimabdo Dec 7, 2015
534ad9a
Add minute step greater than 60
ibrahimabdo Dec 7, 2015
c518ed6
Add minute steps greater than 60
ibrahimabdo Dec 9, 2015
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
30 changes: 28 additions & 2 deletions js/bootstrap-timepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,20 @@
if (step) {
newVal = this.minute - step;
} else {
newVal = this.minute - this.minuteStep;
var minuteStep = this.minuteStep;
if (this.minuteStep > 60) {
var hourStep = Math.floor(this.minuteStep / 60);
minuteStep -= (hourStep * 60);
if (minuteStep == 0) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

=== please; this fails lint checks

minuteStep = 60;
}

for (var i = 0; i<hourStep-(minuteStep == 60 ? 1 : 0); i++) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use ===, and add whitespace around operators, like you see in the rest of the code (hopefully).

If you're worried about verbosity on this line, you can pull out hourStep - (minuteStep === 60 ? 1 : 0) into a variable declared in the line above.

this.decrementHour();
}
}

newVal = this.minute - minuteStep;
}

if (newVal < 0) {
Expand Down Expand Up @@ -559,7 +572,20 @@
if (step) {
newVal = this.minute + step;
} else {
newVal = this.minute + this.minuteStep - (this.minute % this.minuteStep);
var minuteStep = this.minuteStep;
if (this.minuteStep > 60) {
var hourStep = Math.floor(this.minuteStep / 60);
minuteStep -= (hourStep * 60);
if (minuteStep == 0) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

===

minuteStep = 60;
}

for (var i = 0; i<hourStep-(minuteStep == 60 ? 1 : 0); i++) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

===

this.incrementHour();
}
}

newVal = this.minute + minuteStep - (this.minute % minuteStep);
}

if (newVal > 59) {
Expand Down