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

fix: fix customParseFormat plugin parsing date bug #1198

Merged
merged 1 commit into from
Nov 10, 2020
+3 −1
Merged

fix: fix customParseFormat plugin parsing date bug #1198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/plugin/customParseFormat/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function correctHours(time) {
}

function makeParser(format) {
format = u(format, locale.formats)
format = u(format, locale && locale.formats)
const array = format.match(formattingTokens)
const { length } = array
for (let i = 0; i < length; i += 1) {
Expand Down Expand Up @@ -224,6 +224,8 @@ export default (o, C, d) => {
if (isStrict && date !== this.format(format)) {
this.$d = new Date('')
}
// reset global locale to make parallel unit test
locale = undefined
} else if (format instanceof Array) {
const len = format.length
for (let i = 1; i <= len; i += 1) {
Expand Down