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

Commit 0fa851f

Browse files
committed
feat(dateparser): use uib- prefix
Closes #4504
1 parent 298ec8c commit 0fa851f

File tree

3 files changed

+49
-4
lines changed

3 files changed

+49
-4
lines changed

src/dateparser/dateparser.js

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

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

@@ -210,3 +210,17 @@ angular.module('ui.bootstrap.dateparser', [])
210210
return true;
211211
}
212212
}]);
213+
214+
/* Deprecated dateparser below */
215+
216+
angular.module('ui.bootstrap.dateparser')
217+
218+
.value('$dateParserSuppressWarning', false)
219+
220+
.service('dateParser', ['$log', '$dateParserSuppressWarning', 'uibDateParser', function($log, $dateParserSuppressWarning, uibDateParser) {
221+
if (!$dateParserSuppressWarning) {
222+
$log.warn('dateParser is now deprecated. Use uibDateParser instead.');
223+
}
224+
225+
angular.extend(this, uibDateParser);
226+
}]);

src/dateparser/test/dateparser.spec.js

+33-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ describe('date parser', function() {
22
var dateParser;
33

44
beforeEach(module('ui.bootstrap.dateparser'));
5-
beforeEach(inject(function (_dateParser_) {
6-
dateParser = _dateParser_;
5+
beforeEach(inject(function (uibDateParser) {
6+
dateParser = uibDateParser;
77
}));
88

99
function expectParse(input, format, date) {
@@ -224,3 +224,34 @@ describe('date parser', function() {
224224
expect(dateParser.init).toHaveBeenCalled();
225225
}));
226226
});
227+
228+
/* Deprecation tests below */
229+
230+
describe('date parser deprecation', function() {
231+
beforeEach(module('ui.bootstrap.dateparser'));
232+
233+
it('should suppress warning', function() {
234+
module(function($provide) {
235+
$provide.value('$dateParserSuppressWarning', true);
236+
});
237+
238+
inject(function($log, dateParser) {
239+
spyOn($log, 'warn');
240+
241+
dateParser.parse('01.10.2015', 'dd.MM.yyyy');
242+
243+
expect($log.warn.calls.count()).toBe(0);
244+
});
245+
});
246+
247+
it('should give warning by default', inject(function($log) {
248+
spyOn($log, 'warn');
249+
250+
inject(function(dateParser) {
251+
dateParser.parse('01.10.2015', 'dd.MM.yyyy');
252+
253+
expect($log.warn.calls.count()).toBe(1);
254+
expect($log.warn.calls.argsFor(0)).toEqual(['dateParser is now deprecated. Use uibDateParser instead.']);
255+
});
256+
}));
257+
});

src/datepicker/datepicker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
492492
onOpenFocus: true
493493
})
494494

495-
.directive('datepickerPopup', ['$compile', '$parse', '$document', '$rootScope', '$position', 'dateFilter', 'dateParser', 'datepickerPopupConfig', '$timeout',
495+
.directive('datepickerPopup', ['$compile', '$parse', '$document', '$rootScope', '$position', 'dateFilter', 'uibDateParser', 'datepickerPopupConfig', '$timeout',
496496
function($compile, $parse, $document, $rootScope, $position, dateFilter, dateParser, datepickerPopupConfig, $timeout) {
497497
return {
498498
restrict: 'EA',

0 commit comments

Comments
 (0)