Skip to content

Commit d4bc29b

Browse files
committed
Bug fixes.
1 parent ff3257f commit d4bc29b

File tree

9 files changed

+22
-27
lines changed

9 files changed

+22
-27
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
composer.phar
22
/vendor/
3-
4-
# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
5-
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
6-
# composer.lock
3+
config/config.yml

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"sass"
99
],
1010
"homepage": "https://github.com/deviscoding/custom-time",
11-
"version": "1.0.2",
11+
"version": "1.0.3",
1212
"authors": [
1313
{
1414
"name": "AMJones",

composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/custom-time.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* CustomTime v1.0.2 (https://github.com/deviscoding/custom-time) with Icons from Open Iconic (https://useiconic.com/open)
2+
* CustomTime v1.0.3 (https://github.com/deviscoding/custom-time) with Icons from Open Iconic (https://useiconic.com/open)
33
* @author AMJones [am@jonesiscoding.com]
44
* @licence MIT (https://github.com/deviscoding/custom-time/blob/master/LICENSE)
55
*/
@@ -30,8 +30,6 @@
3030

3131
.custom-time-wrapper select[class*="custom-time-"] {
3232
background-color: transparent;
33-
-webkit-appearance: none;
34-
-moz-appearance: none;
3533
appearance: none;
3634
border: none !important;
3735
border-radius: 0 !important;

dist/css/custom-time.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/custom-time.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* CustomTime v1.0.2 (https://github.com/deviscoding/custom-time)
2+
* CustomTime v1.0.3 (https://github.com/deviscoding/custom-time)
33
* @author AMJones [am@jonesiscoding.com]
44
* @licence MIT (https://github.com/deviscoding/custom-time/blob/master/LICENSE)
55
*/
@@ -33,7 +33,7 @@
3333

3434
ct.step = function(key) {
3535
if(_step === null) {
36-
var s = ct.$input.attr('step') || 60;
36+
var s = parseInt(ct.$input.attr('step')) || 60;
3737
_step = { h: 1, i: 1, s: 1 };
3838
if(s >= 3600) {
3939
_step.h = Math.floor(s/3600);
@@ -59,11 +59,11 @@
5959
}
6060
} else {
6161
var a = ct.$cnv.val();
62-
var h = ct.$hour.val();
62+
var h = ct.$hour.val() || null;
6363
var i = ( ct.settings.widgets.i ) ? ct.$min.val() : '00';
6464
var s = ( ct.settings.widgets.s ) ? ct.$sec.val() : null;
6565

66-
if ( a.length && i.length && h.length ) {
66+
if ( a.length && i.length && (h && h.length) ) {
6767
if(12 == h) { h = "0"; }
6868
if ( 'am' !== a ) {
6969
var hh = 12 + parseInt(h,10);
@@ -87,7 +87,7 @@
8787
var a = 'am';
8888

8989
if(h >= 12) {
90-
h = (minmax) ? 12 : h - 12;
90+
h = (minmax || h === 12) ? 12 : h - 12;
9191
a = 'pm';
9292
} else if(minmax && 0 === h) {
9393
h = 1;

dist/js/custom-time.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/custom-time.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* CustomTime v1.0.2 (https://github.com/deviscoding/custom-time)
2+
* CustomTime v1.0.3 (https://github.com/deviscoding/custom-time)
33
* @author AMJones [am@jonesiscoding.com]
44
* @licence MIT (https://github.com/deviscoding/custom-time/blob/master/LICENSE)
55
*/
@@ -33,7 +33,7 @@
3333

3434
ct.step = function(key) {
3535
if(_step === null) {
36-
var s = ct.$input.attr('step') || 60;
36+
var s = parseInt(ct.$input.attr('step')) || 60;
3737
_step = { h: 1, i: 1, s: 1 };
3838
if(s >= 3600) {
3939
_step.h = Math.floor(s/3600);
@@ -59,11 +59,11 @@
5959
}
6060
} else {
6161
var a = ct.$cnv.val();
62-
var h = ct.$hour.val();
62+
var h = ct.$hour.val() || null;
6363
var i = ( ct.settings.widgets.i ) ? ct.$min.val() : '00';
6464
var s = ( ct.settings.widgets.s ) ? ct.$sec.val() : null;
6565

66-
if ( a.length && i.length && h.length ) {
66+
if ( a.length && i.length && (h && h.length) ) {
6767
if(12 == h) { h = "0"; }
6868
if ( 'am' !== a ) {
6969
var hh = 12 + parseInt(h,10);
@@ -87,7 +87,7 @@
8787
var a = 'am';
8888

8989
if(h >= 12) {
90-
h = (minmax) ? 12 : h - 12;
90+
h = (minmax || h === 12) ? 12 : h - 12;
9191
a = 'pm';
9292
} else if(minmax && 0 === h) {
9393
h = 1;

scss/_custom-time.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@if(variable_exists(use-framework)) {
44
@if not($use-framework) {
55
/**
6-
* CustomTime v1.0.2 (https://github.com/deviscoding/custom-time) with Icons from Open Iconic (https://useiconic.com/open)
6+
* CustomTime v1.0.3 (https://github.com/deviscoding/custom-time) with Icons from Open Iconic (https://useiconic.com/open)
77
* @author AMJones [am@jonesiscoding.com]
88
* @licence MIT (https://github.com/deviscoding/custom-time/blob/master/LICENSE)
99
*/

0 commit comments

Comments
 (0)