drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make date more IE friendly

Browse source
This commit is contained in:
Sergio Crisostomo 2017-08-31 16:45:22 +02:00
parent 8a4f9d5af3
commit 58ff14d782
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -41,7 +41,7 @@
}, },
"dependencies": { "dependencies": {
"async-validator": "^1.7.1", "async-validator": "^1.7.1",
"core-js": "^2.4.1", "core-js": "^2.5.0",
"deepmerge": "^1.5.0", "deepmerge": "^1.5.0",
"popper.js": "^0.6.4", "popper.js": "^0.6.4",
"tinycolor2": "^1.4.1" "tinycolor2": "^1.4.1"

14
src/components/date-picker/util.js
View file

@ -1,9 +1,17 @@
import dateUtil from '../../utils/date'; import dateUtil from '../../utils/date';
export const toDate = function(date) { export const toDate = function(date) {
date = new Date(date); let _date = new Date(date);
if (isNaN(date.getTime())) return null; // IE patch start (#1422)
return date; if (isNaN(_date.getTime()) && typeof date === 'string'){
_date = date.split('-').map(Number);
_date[1] += 1;
_date = new Date(..._date);
}
// IE patch end
if (isNaN(_date.getTime())) return null;
return _date;
}; };
export const formatDate = function(date, format) { export const formatDate = function(date, format) {

1
src/index.js
View file

@ -1,4 +1,5 @@
// es6 polyfill // es6 polyfill
import 'core-js/fn/array/find';
import 'core-js/fn/array/find-index'; import 'core-js/fn/array/find-index';
import Affix from './components/affix'; import Affix from './components/affix';