sjs/strftime
1
0
Fork 0
mirror of https://github.com/samsonjs/strftime.git synced 2026-03-25 09:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #69 from stiang/master

Browse source 
Make strftime play nice with dates that have been extended by DateJS
This commit is contained in:
Sami Samhuri 2016-12-27 10:52:20 -08:00 committed by GitHub
commit 65aa4d5ea9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
strftime.js
View file

@ -74,7 +74,7 @@
adaptForwards(adaptedStrftime); adaptForwards(adaptedStrftime);
function adaptedStrftime(fmt, d, locale) { function adaptedStrftime(fmt, d, locale) {
// d and locale are optional, check if this is (format, locale) // d and locale are optional, check if this is (format, locale)
if (d && d.days) { if (d && d.days && !d.getTime) {
locale = d; locale = d;
d = undefined; d = undefined;
} }