Permalink
Browse files

Fix show2400 option

Close #449. Thanks @low!
  • Loading branch information...
1 parent 5a4e67a commit 21b504ae646777fc8f22152d3e83e1ecbd4059e2 @jonthornton committed Nov 2, 2015
Showing with 7 additions and 7 deletions.
  1. +1 −1 GruntFile.js
  2. +1 −1 bower.json
  3. +2 −2 jquery.timepicker.js
  4. +2 −2 jquery.timepicker.min.js
  5. +1 −1 package.json
View
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
},
jshint: {
all: ['jquery.timepicker.js']
- },
+ },
});
grunt.loadNpmTasks('grunt-contrib-uglify');
View
@@ -1,6 +1,6 @@
{
"name" : "jt.timepicker",
- "version" : "1.8.3",
+ "version" : "1.8.4",
"description" : "A jQuery timepicker plugin inspired by Google Calendar.",
"homepage" : "http://jonthornton.github.com/jquery-timepicker",
"main" : [ "./jquery.timepicker.js", "./jquery.timepicker.css" ],
@@ -1,5 +1,5 @@
/*!
- * jquery-timepicker v1.8.3 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
+ * jquery-timepicker v1.8.4 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
* Copyright (c) 2015 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
* License: MIT
*/
@@ -1046,7 +1046,7 @@
case 'H':
hour = time.getHours();
- if (seconds === _ONE_DAY) hour = 24;
+ if (seconds === _ONE_DAY) hour = settings.show2400 ? 24 : 0;
output += (hour > 9) ? hour : '0'+hour;
break;
Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "timepicker",
- "version": "1.8.3",
+ "version": "1.8.4",
"title": "jquery-timepicker",
"author": {
"name": "Jon Thornton",

0 comments on commit 21b504a

Please sign in to comment.