Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(dateFilter): ignore era format specifier "G" #10543

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ng/filter/filters.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ var DATE_FORMATS = {
w: weekGetter(1)
};

var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEw']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|w+))(.*)/,
var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|w+))(.*)/,
NUMBER_STRING = /^\-?\d+$/;

/**
Expand Down
4 changes: 4 additions & 0 deletions test/ng/filter/filtersSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,10 @@ describe('filters', function() {

expect(date(earlyDate, "MMMM dd, y")).
toEqual('September 03, 1');

expect(date(earlyDate, "MMMM dd, G y")).
toEqual('September 03, 1');

});

it('should accept negative numbers as strings', function() {
Expand Down