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

Commit 3e10184

Browse files
committed
feat(datepicker): pass options from popup to inline
- Pass through options object wholesale from popup to inline datepicker Closes #5355 BREAKING CHANGE: This breaks any snake-cased key usage, i.e. `show-weeks`. Convert all keys used to camelCase.
1 parent d88c0fb commit 3e10184

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/datepicker/datepicker.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -767,14 +767,11 @@ function(scope, element, attrs, $compile, $parse, $document, $rootScope, $positi
767767
}
768768

769769
if (scope.datepickerOptions) {
770-
angular.forEach(scope.datepickerOptions, function(value, option) {
771-
// Ignore this options, will be managed later
772-
if (['minDate', 'maxDate', 'minMode', 'maxMode', 'initDate', 'datepickerMode'].indexOf(option) === -1) {
773-
datepickerEl.attr(cameltoDash(option), value);
774-
} else {
775-
datepickerEl.attr(cameltoDash(option), 'datepickerOptions.' + option);
776-
}
777-
});
770+
datepickerEl.attr('datepicker-options', 'datepickerOptions');
771+
772+
if (angular.isDefined(scope.datepickerOptions.datepickerMode)) {
773+
datepickerEl.attr('datepicker-mode', 'datepickerOptions.datepickerMode');
774+
}
778775
}
779776

780777
angular.forEach(['minMode', 'maxMode', 'datepickerMode', 'shortcutPropagation'], function(key) {

src/datepicker/test/datepicker.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2103,7 +2103,7 @@ describe('datepicker', function() {
21032103
describe('show-weeks', function() {
21042104
beforeEach(function() {
21052105
$rootScope.opts = {
2106-
'show-weeks': false
2106+
showWeeks: false
21072107
};
21082108
var wrapElement = $compile('<div><input ng-model="date" uib-datepicker-popup datepicker-options="opts" is-open="true"></div>')($rootScope);
21092109
$rootScope.$digest();
@@ -2123,7 +2123,7 @@ describe('datepicker', function() {
21232123
beforeEach(function() {
21242124
$rootScope.date = null;
21252125
$rootScope.opts = {
2126-
'initDate': new Date('November 9, 1980')
2126+
initDate: new Date('November 9, 1980')
21272127
};
21282128
var wrapElement = $compile('<div><input ng-model="date" uib-datepicker-popup datepicker-options="opts" is-open="true"></div>')($rootScope);
21292129
$rootScope.$digest();

0 commit comments

Comments
 (0)