Skip to content

Commit 221d699

Browse files
author
Charlie Kassel
committed
Merge branch 'master' of github.com:charliekassel/vuejs-datepicker
* 'master' of github.com:charliekassel/vuejs-datepicker: Saturday short name is wrong for Greek language. 1.5.3 fix wrong white-space value correct language name of vi Fix typo remove allowTyping function, remove unnecessary arguments for Date.UTC Update es.js eslint and unit test fixes readonly not typable add readonly to Datepicker add readonly to DateInput.vue
2 parents cd96cb6 + e717f30 commit 221d699

File tree

9 files changed

+9
-29
lines changed

9 files changed

+9
-29
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vuejs-datepicker",
3-
"version": "1.5.2",
3+
"version": "1.5.3",
44
"description": "A simple Vue.js datepicker component. Supports disabling of dates, inline mode, translations",
55
"keywords": [
66
"vue",

src/components/DateInput.vue

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
:clear-button="clearButton"
2323
:disabled="disabled"
2424
:required="required"
25+
:readonly="!typeable"
2526
@click="showCalendar"
26-
@keydown="allowTyping"
2727
@keyup="parseTypedDate"
2828
@blur="inputBlurred"
2929
autocomplete="off">
@@ -104,18 +104,6 @@ export default {
104104
showCalendar () {
105105
this.$emit('showCalendar')
106106
},
107-
/**
108-
* Prevent typing if not typeable
109-
* @param {Event} event
110-
* @return {Boolean}
111-
*/
112-
allowTyping (event) {
113-
if (!this.typeable) {
114-
event.preventDefault()
115-
return false
116-
}
117-
return true
118-
},
119107
/**
120108
* Attempt to parse a typed date
121109
* @param {Event} event
@@ -124,7 +112,7 @@ export default {
124112
// close calendar if escape or enter are pressed
125113
if ([
126114
27, // escape
127-
13 // enter
115+
13 // enter
128116
].includes(event.keyCode)) {
129117
this.input.blur()
130118
}

src/locale/translations/el.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default new Language(
44
'Greek',
55
['Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάϊος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος'],
66
['Ιαν', 'Φεβ', 'Μαρ', 'Απρ', 'Μαι', 'Ιουν', 'Ιουλ', 'Αυγ', 'Σεπ', 'Οκτ', 'Νοε', 'Δεκ'],
7-
['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σατ']
7+
['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σαβ']
88
)
99
// eslint-disable-next-line
1010
;

src/locale/translations/es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default new Language(
44
'Spanish',
55
['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
66
['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'],
7-
['Dom', 'Lun', 'Mar', 'Mié', 'Jue', 'Vie', 'Sab']
7+
['Dom', 'Lun', 'Mar', 'Mié', 'Jue', 'Vie', 'Sáb']
88
)
99
// eslint-disable-next-line
1010
;

src/locale/translations/fi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Language from '../Language'
22

33
export default new Language(
4-
'Finish',
4+
'Finnish',
55
['tammikuu', 'helmikuu', 'maaliskuu', 'huhtikuu', 'toukokuu', 'kesäkuu', 'heinäkuu', 'elokuu', 'syyskuu', 'lokakuu', 'marraskuu', 'joulukuu'],
66
['tammi', 'helmi', 'maalis', 'huhti', 'touko', 'kesä', 'heinä', 'elo', 'syys', 'loka', 'marras', 'joulu'],
77
['su', 'ma', 'ti', 'ke', 'to', 'pe', 'la']

src/locale/translations/vi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Language from '../Language'
22

33
export default new Language(
4-
'Vientnamese',
4+
'Vietnamese',
55
['Tháng 1', 'Tháng 2', 'Tháng 3', 'Tháng 4', 'Tháng 5', 'Tháng 6', 'Tháng 7', 'Tháng 8', 'Tháng 9', 'Tháng 10', 'Tháng 11', 'Tháng 12'],
66
['T 01', 'T 02', 'T 03', 'T 04', 'T 05', 'T 06', 'T 07', 'T 08', 'T 09', 'T 10', 'T 11', 'T 12'],
77
['CN', 'Thứ 2', 'Thứ 3', 'Thứ 4', 'Thứ 5', 'Thứ 6', 'Thứ 7']

src/styles/style.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797

9898
&.day-header
9999
font-size 75%
100-
white-space no-wrap
100+
white-space nowrap
101101
cursor inherit
102102
&:hover
103103
background inherit

test/unit/specs/DateInput/typedDates.spec.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ describe('DateInput', () => {
1515
})
1616
})
1717

18-
it('allows typing', () => {
19-
wrapper.setProps({typeable: true})
20-
expect(wrapper.vm.allowTyping()).toEqual(true)
21-
wrapper.setProps({typeable: false})
22-
expect(wrapper.vm.allowTyping({preventDefault: () => {}})).toEqual(false)
23-
})
24-
2518
it('does not format the date when typed', () => {
2619
const dateString = '2018-04-24'
2720
wrapper.vm.input.value = dateString

test/unit/specs/Datepicker/Datepicker.spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ describe('Datepicker.vue set by timestamp', () => {
239239
wrapper = shallow(Datepicker, {
240240
propsData: {
241241
format: 'yyyy MM dd',
242-
value: new Date(2018, 0, 29).getTime()
242+
value: new Date(Date.UTC(2018, 0, 29)).getTime()
243243
}
244244
})
245245
expect(wrapper.vm.selectedDate.getFullYear()).toEqual(2018)
@@ -312,4 +312,3 @@ describe('Datepicker with initial-view', () => {
312312
expect(wrapper.vm.showYearView).toEqual(true)
313313
})
314314
})
315-

0 commit comments

Comments
 (0)