Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 5a3e44a

Browse files
Douglas Ludlowwesleycho
Douglas Ludlow
authored andcommitted
feat(dateparser): allow overriding of parsers
- Add ability to override parser Closes #6370 Closes #6373
1 parent 4872c05 commit 5a3e44a

File tree

2 files changed

+42
-1
lines changed

2 files changed

+42
-1
lines changed

Diff for: src/dateparser/dateparser.js

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
angular.module('ui.bootstrap.dateparser', [])
22

3-
.service('uibDateParser', ['$log', '$locale', 'dateFilter', 'orderByFilter', function($log, $locale, dateFilter, orderByFilter) {
3+
.service('uibDateParser', ['$log', '$locale', 'dateFilter', 'orderByFilter', 'filterFilter', function($log, $locale, dateFilter, orderByFilter, filterFilter) {
44
// Pulled from https://github.com/mbostock/d3/blob/master/src/format/requote.js
55
var SPECIAL_CHARACTERS_REGEXP = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
66

@@ -243,6 +243,23 @@ angular.module('ui.bootstrap.dateparser', [])
243243

244244
this.init();
245245

246+
function getFormatCodeToRegex(key) {
247+
return filterFilter(formatCodeToRegex, {key: key}, true)[0];
248+
}
249+
250+
this.getParser = function (key) {
251+
var f = getFormatCodeToRegex(key);
252+
return f && f.apply || null;
253+
};
254+
255+
this.overrideParser = function (key, parser) {
256+
var f = getFormatCodeToRegex(key);
257+
if (f && angular.isFunction(parser)) {
258+
this.parsers = {};
259+
f.apply = parser;
260+
}
261+
}.bind(this);
262+
246263
function createParser(format) {
247264
var map = [], regex = format.split('');
248265

Diff for: src/dateparser/test/dateparser.spec.js

+24
Original file line numberDiff line numberDiff line change
@@ -791,4 +791,28 @@ describe('date parser', function() {
791791
});
792792
});
793793
});
794+
795+
describe('overrideParser', function() {
796+
var twoDigitYearParser = function (value) {
797+
this.year = +value + (+value > 30 ? 1900 : 2000);
798+
};
799+
800+
it('should get the current parser', function() {
801+
expect(dateParser.getParser('yy')).toBeTruthy();
802+
});
803+
804+
it('should override the parser', function() {
805+
dateParser.overrideParser('yy', twoDigitYearParser);
806+
expect(dateParser.parse('68', 'yy').getFullYear()).toEqual(1968);
807+
expect(dateParser.parse('67', 'yy').getFullYear()).toEqual(1967);
808+
expect(dateParser.parse('31', 'yy').getFullYear()).toEqual(1931);
809+
expect(dateParser.parse('30', 'yy').getFullYear()).toEqual(2030);
810+
});
811+
812+
it('should clear cached parsers', function() {
813+
expect(dateParser.parse('68', 'yy').getFullYear()).toEqual(2068);
814+
dateParser.overrideParser('yy', twoDigitYearParser);
815+
expect(dateParser.parse('68', 'yy').getFullYear()).toEqual(1968);
816+
});
817+
});
794818
});

0 commit comments

Comments
 (0)