From: Iskren Chernev Date: Mon, 9 Nov 2015 05:25:31 +0000 (-0800) Subject: Use isFunction instead of === 'function' X-Git-Tag: 2.11.0~39^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2bf292f845b7011715df0687fcc044d8ba5c0c;p=thirdparty%2Fmoment.git Use isFunction instead of === 'function' --- diff --git a/src/lib/moment/calendar.js b/src/lib/moment/calendar.js index 6480c862e..bc5092ca8 100644 --- a/src/lib/moment/calendar.js +++ b/src/lib/moment/calendar.js @@ -1,5 +1,6 @@ import { createLocal } from '../create/local'; import { cloneWithOffset } from '../units/offset'; +import isFunction from '../utils/is-function'; export function calendar (time, formats) { // We want to compare the start of today, vs this. @@ -14,7 +15,7 @@ export function calendar (time, formats) { diff < 2 ? 'nextDay' : diff < 7 ? 'nextWeek' : 'sameElse'; - var output = formats && (typeof formats[format] === 'function' ? formats[format]() : formats[format]); + var output = formats && (isFunction(formats[format]) ? formats[format]() : formats[format]); return this.format(output || this.localeData().calendar(format, this, createLocal(now))); }