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

Commit d880aea

Browse files
wesleychowesleycho
committed
feat(datepicker): move attribute support to options
- Move some attribute usage to datepickerOptions Closes #5528
1 parent b245242 commit d880aea

File tree

3 files changed

+195
-23
lines changed

3 files changed

+195
-23
lines changed

‎src/datepicker/datepicker.js

+22-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
3535

3636
if (optionsUsed) {
3737
[
38+
'customClass',
39+
'dateDisabled',
3840
'datepickerMode',
3941
'formatDay',
4042
'formatDayHeader',
@@ -54,6 +56,10 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
5456
'yearRows'
5557
].forEach(function(key) {
5658
switch (key) {
59+
case 'customClass':
60+
case 'dateDisabled':
61+
$scope[key] = $scope.datepickerOptions[key] || angular.noop;
62+
break;
5763
case 'datepickerMode':
5864
$scope.datepickerMode = angular.isDefined($scope.datepickerOptions.datepickerMode) ?
5965
$scope.datepickerOptions.datepickerMode : datepickerConfig.datepickerMode;
@@ -156,6 +162,12 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
156162
}
157163
});
158164

165+
angular.forEach(['dateDisabled', 'customClass'], function(key) {
166+
if (angular.isDefined($attrs[key]) && datepickerAttributeWarning) {
167+
$log.warn('uib-datepicker ' + key + ' attribute usage is deprecated, use datepicker-options attribute instead');
168+
}
169+
});
170+
159171
if (angular.isDefined($attrs.startingDay)) {
160172
if (datepickerAttributeWarning) {
161173
$log.warn('uib-datepicker startingDay attribute usage is deprecated, use datepicker-options attribute instead');
@@ -320,7 +332,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
320332
return $scope.disabled ||
321333
this.minDate && this.compare(date, this.minDate) < 0 ||
322334
this.maxDate && this.compare(date, this.maxDate) > 0 ||
323-
$attrs.dateDisabled && $scope.dateDisabled({date: date, mode: $scope.datepickerMode});
335+
$scope.dateDisabled && $scope.dateDisabled({date: date, mode: $scope.datepickerMode});
324336
};
325337

326338
this.customClass = function(date) {
@@ -865,7 +877,7 @@ function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $
865877

866878
angular.forEach(['minMode', 'maxMode', 'datepickerMode', 'shortcutPropagation'], function(key) {
867879
if ($attrs[key]) {
868-
if (key !== 'datepickerMode' && datepickerPopupAttributeWarning) {
880+
if (datepickerPopupAttributeWarning) {
869881
$log.warn('uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead');
870882
}
871883

@@ -920,6 +932,10 @@ function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $
920932
});
921933

922934
if ($attrs.dateDisabled) {
935+
if (datepickerPopupAttributeWarning) {
936+
$log.warn('uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead');
937+
}
938+
923939
datepickerEl.attr('date-disabled', 'dateDisabled({ date: date, mode: mode })');
924940
}
925941

@@ -934,6 +950,10 @@ function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $
934950
});
935951

936952
if ($attrs.customClass) {
953+
if (datepickerPopupAttributeWarning) {
954+
$log.warn('uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead');
955+
}
956+
937957
datepickerEl.attr('custom-class', 'customClass({ date: date, mode: mode })');
938958
}
939959

‎src/datepicker/docs/readme.md

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ The datepicker has 3 modes:
3333

3434
The supported options are:
3535

36+
- customClass
37+
- dateDisabled
38+
- datepickerMode
3639
- formatDay
3740
- formatDayHeader
3841
- formatDayTitle

‎src/datepicker/test/datepicker.spec.js

+170-21
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,88 @@ describe('datepicker', function() {
230230
expect($log.warn).not.toHaveBeenCalled();
231231
});
232232

233+
it('should log warning for customClass attribute usage', function() {
234+
inject(function(_$log_, _$rootScope_, _$compile_) {
235+
$log = _$log_;
236+
$scope = _$rootScope_.$new();
237+
$compile = _$compile_;
238+
});
239+
240+
$scope.locals = {
241+
date: new Date(),
242+
customClass: 'none'
243+
};
244+
245+
spyOn($log, 'warn');
246+
element = $compile('<uib-datepicker ng-model="locals.date" custom-class="locals.customClass"></uib-datepicker>')($scope);
247+
$scope.$digest();
248+
249+
expect($log.warn).toHaveBeenCalledWith('uib-datepicker customClass attribute usage is deprecated, use datepicker-options attribute instead');
250+
});
251+
252+
it('should suppress warning for customClass attribute usage', function() {
253+
module(function($provide) {
254+
$provide.value('uibDatepickerAttributeWarning', false);
255+
});
256+
inject(function(_$log_, _$rootScope_, _$compile_) {
257+
$log = _$log_;
258+
$scope = _$rootScope_.$new();
259+
$compile = _$compile_;
260+
});
261+
262+
$scope.locals = {
263+
date: new Date(),
264+
customClass: 'none'
265+
};
266+
267+
spyOn($log, 'warn');
268+
element = $compile('<uib-datepicker ng-model="locals.date" custom-class="locals.customClass"></uib-datepicker>')($scope);
269+
$scope.$digest();
270+
271+
expect($log.warn).not.toHaveBeenCalled();
272+
});
273+
274+
it('should log warning for dateDisabled attribute usage', function() {
275+
inject(function(_$log_, _$rootScope_, _$compile_) {
276+
$log = _$log_;
277+
$scope = _$rootScope_.$new();
278+
$compile = _$compile_;
279+
});
280+
281+
$scope.locals = {
282+
date: new Date(),
283+
dateDisabled: false
284+
};
285+
286+
spyOn($log, 'warn');
287+
element = $compile('<uib-datepicker ng-model="locals.date" date-disabled="locals.dateDisabled"></uib-datepicker>')($scope);
288+
$scope.$digest();
289+
290+
expect($log.warn).toHaveBeenCalledWith('uib-datepicker dateDisabled attribute usage is deprecated, use datepicker-options attribute instead');
291+
});
292+
293+
it('should suppress warning for dateDisabled attribute usage', function() {
294+
module(function($provide) {
295+
$provide.value('uibDatepickerAttributeWarning', false);
296+
});
297+
inject(function(_$log_, _$rootScope_, _$compile_) {
298+
$log = _$log_;
299+
$scope = _$rootScope_.$new();
300+
$compile = _$compile_;
301+
});
302+
303+
$scope.locals = {
304+
date: new Date(),
305+
dateDisabled: false
306+
};
307+
308+
spyOn($log, 'warn');
309+
element = $compile('<uib-datepicker ng-model="locals.date" date-disabled="locals.dateDisabled"></uib-datepicker>')($scope);
310+
$scope.$digest();
311+
312+
expect($log.warn).not.toHaveBeenCalled();
313+
});
314+
233315
it('should log warning for datepickerMode attribute usage', function() {
234316
inject(function(_$log_, _$rootScope_, _$compile_) {
235317
$log = _$log_;
@@ -956,6 +1038,76 @@ describe('datepicker', function() {
9561038
expect($log.warn).not.toHaveBeenCalled();
9571039
});
9581040

1041+
it('should log warning for customClass attribute usage', function() {
1042+
inject(function(_$log_, _$rootScope_, _$compile_) {
1043+
$log = _$log_;
1044+
$scope = _$rootScope_.$new();
1045+
$compile = _$compile_;
1046+
});
1047+
1048+
$scope.date = new Date();
1049+
1050+
spyOn($log, 'warn');
1051+
element = $compile('<div><input ng-model="date" uib-datepicker-popup custom-class="true"></div>')($scope);
1052+
$scope.$digest();
1053+
1054+
expect($log.warn).toHaveBeenCalledWith('uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead');
1055+
});
1056+
1057+
it('should suppress warning for customClass attribute usage', function() {
1058+
module(function($provide) {
1059+
$provide.value('uibDatepickerPopupAttributeWarning', false);
1060+
});
1061+
inject(function(_$log_, _$rootScope_, _$compile_) {
1062+
$log = _$log_;
1063+
$scope = _$rootScope_.$new();
1064+
$compile = _$compile_;
1065+
});
1066+
1067+
$scope.date = new Date();
1068+
1069+
spyOn($log, 'warn');
1070+
element = $compile('<div><input ng-model="date" uib-datepicker-popup custom-class="true"></div>')($scope);
1071+
$scope.$digest();
1072+
1073+
expect($log.warn).not.toHaveBeenCalled();
1074+
});
1075+
1076+
it('should log warning for dateDisabled attribute usage', function() {
1077+
inject(function(_$log_, _$rootScope_, _$compile_) {
1078+
$log = _$log_;
1079+
$scope = _$rootScope_.$new();
1080+
$compile = _$compile_;
1081+
});
1082+
1083+
$scope.date = new Date();
1084+
1085+
spyOn($log, 'warn');
1086+
element = $compile('<div><input ng-model="date" uib-datepicker-popup date-disabled="true"></div>')($scope);
1087+
$scope.$digest();
1088+
1089+
expect($log.warn).toHaveBeenCalledWith('uib-datepicker-popup attributes are deprecated and will be removed in UI Bootstrap 1.3, use datepicker-options attribute instead');
1090+
});
1091+
1092+
it('should suppress warning for dateDisabled attribute usage', function() {
1093+
module(function($provide) {
1094+
$provide.value('uibDatepickerPopupAttributeWarning', false);
1095+
});
1096+
inject(function(_$log_, _$rootScope_, _$compile_) {
1097+
$log = _$log_;
1098+
$scope = _$rootScope_.$new();
1099+
$compile = _$compile_;
1100+
});
1101+
1102+
$scope.date = new Date();
1103+
1104+
spyOn($log, 'warn');
1105+
element = $compile('<div><input ng-model="date" uib-datepicker-popup date-disabled="true"></div>')($scope);
1106+
$scope.$digest();
1107+
1108+
expect($log.warn).not.toHaveBeenCalled();
1109+
});
1110+
9591111
it('should log warning for onOpenFocus attribute usage', function() {
9601112
inject(function(_$log_, _$rootScope_, _$compile_) {
9611113
$log = _$log_;
@@ -2879,51 +3031,55 @@ describe('datepicker', function() {
28793031

28803032
describe('date-disabled expression', function() {
28813033
beforeEach(function() {
2882-
$rootScope.dateDisabledHandler = jasmine.createSpy('dateDisabledHandler');
2883-
element = $compile('<uib-datepicker ng-model="date" date-disabled="dateDisabledHandler(date, mode)"></uib-datepicker>')($rootScope);
3034+
$rootScope.options = {
3035+
dateDisabled: jasmine.createSpy('dateDisabled')
3036+
};
3037+
element = $compile('<uib-datepicker ng-model="date" datepicker-options="options"></uib-datepicker>')($rootScope);
28843038
$rootScope.$digest();
28853039
});
28863040

28873041
it('executes the dateDisabled expression for each visible day plus one for validation', function() {
2888-
expect($rootScope.dateDisabledHandler.calls.count()).toEqual(42 + 1);
3042+
expect($rootScope.options.dateDisabled.calls.count()).toEqual(42 + 1);
28893043
});
28903044

28913045
it('executes the dateDisabled expression for each visible month plus one for validation', function() {
2892-
$rootScope.dateDisabledHandler.calls.reset();
3046+
$rootScope.options.dateDisabled.calls.reset();
28933047
clickTitleButton();
2894-
expect($rootScope.dateDisabledHandler.calls.count()).toEqual(12 + 1);
3048+
expect($rootScope.options.dateDisabled.calls.count()).toEqual(12 + 1);
28953049
});
28963050

28973051
it('executes the dateDisabled expression for each visible year plus one for validation', function() {
28983052
clickTitleButton();
2899-
$rootScope.dateDisabledHandler.calls.reset();
3053+
$rootScope.options.dateDisabled.calls.reset();
29003054
clickTitleButton();
2901-
expect($rootScope.dateDisabledHandler.calls.count()).toEqual(20 + 1);
3055+
expect($rootScope.options.dateDisabled.calls.count()).toEqual(20 + 1);
29023056
});
29033057
});
29043058

29053059
describe('custom-class expression', function() {
29063060
beforeEach(function() {
2907-
$rootScope.customClassHandler = jasmine.createSpy('customClassHandler');
2908-
element = $compile('<uib-datepicker ng-model="date" custom-class="customClassHandler(date, mode)"></uib-datepicker>')($rootScope);
3061+
$rootScope.options = {
3062+
customClass: jasmine.createSpy('customClass')
3063+
};
3064+
element = $compile('<uib-datepicker ng-model="date" datepicker-options="options"></uib-datepicker>')($rootScope);
29093065
$rootScope.$digest();
29103066
});
29113067

29123068
it('executes the customClass expression for each visible day plus one for validation', function() {
2913-
expect($rootScope.customClassHandler.calls.count()).toEqual(42);
3069+
expect($rootScope.options.customClass.calls.count()).toEqual(42);
29143070
});
29153071

29163072
it('executes the customClass expression for each visible month plus one for validation', function() {
2917-
$rootScope.customClassHandler.calls.reset();
3073+
$rootScope.options.customClass.calls.reset();
29183074
clickTitleButton();
2919-
expect($rootScope.customClassHandler.calls.count()).toEqual(12);
3075+
expect($rootScope.options.customClass.calls.count()).toEqual(12);
29203076
});
29213077

29223078
it('executes the customClass expression for each visible year plus one for validation', function() {
29233079
clickTitleButton();
2924-
$rootScope.customClassHandler.calls.reset();
3080+
$rootScope.options.customClass.calls.reset();
29253081
clickTitleButton();
2926-
expect($rootScope.customClassHandler.calls.count()).toEqual(20);
3082+
expect($rootScope.options.customClass.calls.count()).toEqual(20);
29273083
});
29283084
});
29293085

@@ -4654,13 +4810,6 @@ describe('datepicker', function() {
46544810
]);
46554811
});
46564812
});
4657-
4658-
it('should set dateDisabled on the inner datepicker', function() {
4659-
var wrapElement = $compile('<div><input ng-model="date" uib-datepicker-popup is-open="true" date-disabled="dateDisabledHandler(date, mode)"><div>')($rootScope);
4660-
$rootScope.$digest();
4661-
assignElements(wrapElement);
4662-
expect(dropdownEl.find('div').attr('date-disabled')).toBe('dateDisabled({ date: date, mode: mode })');
4663-
});
46644813
});
46654814

46664815
describe('gc', function() {

0 commit comments

Comments
 (0)