From f6981076ec5743c5a532205ed323bc9a090bddf9 Mon Sep 17 00:00:00 2001 From: Hugh Greenish Date: Thu, 17 Aug 2017 16:59:17 +0100 Subject: [PATCH] Fix fuzzydate string matching logic --- bits/20_jsutils.js | 4 ++-- xlsx.flow.js | 4 ++-- xlsx.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bits/20_jsutils.js b/bits/20_jsutils.js index 0dd0676..a36c9c5 100644 --- a/bits/20_jsutils.js +++ b/bits/20_jsutils.js @@ -133,8 +133,8 @@ function fuzzydate(s/*:string*/)/*:Date*/ { if(y < 0 || y > 8099) return n; if((m > 0 || d > 1) && y != 101) return o; if(s.toLowerCase().match(/jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec/)) return o; - if(s.match(/[^-0-9:,\/\\]/)) return o; - return n; + if(s.match(/[^-0-9:,\/\\]/)) return n; + return o; } var safe_split_regex = "abacaba".split(/(:?b)/i).length == 5; diff --git a/xlsx.flow.js b/xlsx.flow.js index be57790..038b89b 100644 --- a/xlsx.flow.js +++ b/xlsx.flow.js @@ -1600,8 +1600,8 @@ function fuzzydate(s/*:string*/)/*:Date*/ { if(y < 0 || y > 8099) return n; if((m > 0 || d > 1) && y != 101) return o; if(s.toLowerCase().match(/jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec/)) return o; - if(s.match(/[^-0-9:,\/\\]/)) return o; - return n; + if(s.match(/[^-0-9:,\/\\]/)) return n; + return o; } var safe_split_regex = "abacaba".split(/(:?b)/i).length == 5; diff --git a/xlsx.js b/xlsx.js index 8a1e62b..8ee8c93 100644 --- a/xlsx.js +++ b/xlsx.js @@ -1537,8 +1537,8 @@ function fuzzydate(s) { if(y < 0 || y > 8099) return n; if((m > 0 || d > 1) && y != 101) return o; if(s.toLowerCase().match(/jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec/)) return o; - if(s.match(/[^-0-9:,\/\\]/)) return o; - return n; + if(s.match(/[^-0-9:,\/\\]/)) return n; + return o; } var safe_split_regex = "abacaba".split(/(:?b)/i).length == 5;