Skip to content

Commit b82d954

Browse files
committed
Date: Fix dateFormatter
When dateToPartsFormatter was added, dateFormatter became an alias to it. Although `.compileExtracts()` could handle it, `.compile()` and passing `formattersAndParsers` argument couldn't. This update fixed that. Ref globalizejs#24
1 parent 090ee82 commit b82d954

File tree

6 files changed

+11
-25
lines changed

6 files changed

+11
-25
lines changed

lib/compile.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ COMPILED_ORDER = [
1717
// Depends on number and/or plural.
1818
"currencyFormatter",
1919
"dateToPartsFormatter",
20+
"dateFormatter",
2021
"dateParser",
2122
"relativeTimeFormatter",
2223
"unitFormatter"
2324
];
2425

2526
DEPENDENCIES = {
2627
currencyFormatter: { currency: true, number: true },
28+
dateFormatter: { date: true },
2729
dateToPartsFormatter: { date: true },
2830
dateParser: { date: true },
2931
messageFormatter: { message: true },
@@ -41,6 +43,12 @@ DEPENDENCIES_VARS = {
4143
validateParameterPresence: true,
4244
validateParameterTypeNumber: true
4345
},
46+
dateFormatter: {
47+
dateFormatterFn: true,
48+
dateFormat: true,
49+
validateParameterPresence: true,
50+
validateParameterTypeDate: true
51+
},
4452
dateToPartsFormatter: {
4553
dateToPartsFormatterFn: true,
4654
dateToPartsFormat: true,

lib/extract-visitors/global-date-formatter.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

lib/extract-visitors/global-various-formatters-and-parsers-aliases.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var Syntax = esprima.Syntax;
55

66
var map = {
77
formatCurrency: "currencyFormatter",
8-
formatDate: "dateToPartsFormatter",
8+
formatDate: "dateFormatter",
99
formatDateToParts: "dateToPartsFormatter",
1010
formatNumber: "numberFormatter",
1111
formatRelativeTime: "relativeTimeFormatter",

lib/extract-visitors/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module.exports = [
2-
require( "./global-date-formatter" ),
32
require( "./global-format-message" ),
43
require( "./global-message-formatter" ),
54
require( "./global-various-formatters-and-parsers" ),

test/functional/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Globalize.locale("en");
44

55
describe("The compiled `basic.js`", function() {
66
it("should include formatDate", function() {
7-
var result = Globalize.formatDate(new Date(2017, 3, 15), {datetime: "medium"});
7+
var result = Globalize.formatDate(new Date(2017, 3, 15), {date: "medium"});
88
// Note, the reason for the loose match below is due to ignore the local time zone differences.
99
expect(result).to.have.string("Apr");
1010
expect(result).to.have.string("2017");

test/unit/fixtures/basic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var like;
22
var Globalize = require( "globalize" );
33

44
// Use Globalize to format dates.
5-
console.log( Globalize.formatDate( new Date(), { datetime: "medium" } ) );
5+
console.log( Globalize.formatDate( new Date(), { date: "medium" } ) );
66

77
// Use Globalize to format dates to parts.
88
console.log( Globalize.formatDateToParts( new Date(), { datetime: "medium" } ) );

0 commit comments

Comments
 (0)