Skip to content

Commit

Permalink
Merge pull request #102 from phoenixwong/alpha
Browse files Browse the repository at this point in the history
Release v1.0.8
  • Loading branch information
phoenixwong authored Jan 19, 2020
2 parents 1620847 + cb20f74 commit 3d8c805
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 23 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

> The Change Log of Vue2 Timepicker `vue2-timepicker`
## v 1.0.8

### Improvements

Keep the dropdown menu open when mouse drag on the hour/minute/second list's scrollbar handler.

## v 1.0.7

### Fixes
Expand Down
10 changes: 6 additions & 4 deletions dist/VueTimepicker.common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueTimepicker.common.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueTimepicker.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions dist/VueTimepicker.umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueTimepicker.umd.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueTimepicker.umd.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/VueTimepicker.umd.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue2-timepicker",
"version": "1.0.7",
"version": "1.0.8",
"description": "A dropdown time picker (hour|minute|second) for Vue 2.x, with flexible time format support",
"scripts": {
"dev": "cd demo && yarn serve",
Expand Down
21 changes: 12 additions & 9 deletions src/vue-timepicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,9 @@ export default {
},
keepFocusing () {
this.isFocusing = true
if (!this.isFocusing) {
this.isFocusing = true
}
},
validItemsInCol (columnClass) {
Expand Down Expand Up @@ -1378,7 +1380,7 @@ export default {
<div class="select-list" :style="inputWidthStyle" tabindex="-1">
<!-- Common Keyboard Support: less event listeners -->
<template v-if="!advancedKeyboard">
<ul class="hours">
<ul class="hours" @scroll="keepFocusing">
<li class="hint" v-text="hourLabelText"></li>
<template v-for="(hr, hIndex) in hours">
<li v-if="!opts.hideDisabledHours || (opts.hideDisabledHours && !isDisabledHour(hr))"
Expand All @@ -1389,7 +1391,7 @@ export default {
@click="select('hour', hr)"></li>
</template>
</ul>
<ul class="minutes">
<ul class="minutes" @scroll="keepFocusing">
<li class="hint" v-text="minuteLabelText"></li>
<template v-for="(m, mIndex) in minutes">
<li v-if="!opts.hideDisabledMinutes || (opts.hideDisabledMinutes && !isDisabledMinute(m))"
Expand All @@ -1400,7 +1402,7 @@ export default {
@click="select('minute', m)"></li>
</template>
</ul>
<ul class="seconds" v-if="secondType">
<ul class="seconds" v-if="secondType" @scroll="keepFocusing">
<li class="hint" v-text="secondLabelText"></li>
<template v-for="(s, sIndex) in seconds">
<li v-if="!opts.hideDisabledSeconds || (opts.hideDisabledSeconds && !isDisabledSecond(s))"
Expand All @@ -1411,7 +1413,7 @@ export default {
@click="select('second', s)"></li>
</template>
</ul>
<ul class="apms" v-if="apmType">
<ul class="apms" v-if="apmType" @scroll="keepFocusing">
<li class="hint" v-text="apmLabelText"></li>
<template v-for="(a, aIndex) in apms">
<li v-if="!opts.hideDisabledHours || (opts.hideDisabledHours && !isDisabledApm(a))"
Expand All @@ -1429,7 +1431,7 @@ export default {
Addeds hundreds of additional event lisenters
-->
<template v-if="advancedKeyboard">
<ul class="hours" tabindex="-1">
<ul class="hours" tabindex="-1" @scroll="keepFocusing">
<li class="hint" v-text="hourLabelText" tabindex="-1"></li>
<template v-for="(hr, hIndex) in hours">
<li v-if="!opts.hideDisabledHours || (opts.hideDisabledHours && !isDisabledHour(hr))"
Expand All @@ -1451,7 +1453,7 @@ export default {
@focus="keepFocusing"></li>
</template>
</ul>
<ul class="minutes" tabindex="-1">
<ul class="minutes" tabindex="-1" @scroll="keepFocusing">
<li class="hint" v-text="minuteLabelText" tabindex="-1"></li>
<template v-for="(m, mIndex) in minutes">
<li v-if="!opts.hideDisabledMinutes || (opts.hideDisabledMinutes && !isDisabledMinute(m))"
Expand All @@ -1473,7 +1475,7 @@ export default {
@focus="keepFocusing"></li>
</template>
</ul>
<ul class="seconds" v-if="secondType" tabindex="-1">
<ul class="seconds" v-if="secondType" tabindex="-1" @scroll="keepFocusing">
<li class="hint" v-text="secondLabelText" tabindex="-1"></li>
<template v-for="(s, sIndex) in seconds">
<li v-if="!opts.hideDisabledSeconds || (opts.hideDisabledSeconds && !isDisabledSecond(s))"
Expand All @@ -1495,7 +1497,7 @@ export default {
@focus="keepFocusing"></li>
</template>
</ul>
<ul class="apms" v-if="apmType" tabindex="-1">
<ul class="apms" v-if="apmType" tabindex="-1" @scroll="keepFocusing">
<li class="hint" v-text="apmLabelText" tabindex="-1"></li>
<template v-for="(a, aIndex) in apms">
<li v-if="!opts.hideDisabledHours || (opts.hideDisabledHours && !isDisabledApm(a))"
Expand Down Expand Up @@ -1625,6 +1627,7 @@ export default {
padding: 0;
margin: 0;
list-style: none;
outline: 0;
flex: 1 1 0.00001px;
overflow-x: hidden;
Expand Down

0 comments on commit 3d8c805

Please sign in to comment.