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.
This commit is contained in:
@@ -767,14 +767,11 @@ function(scope, element, attrs, $compile, $parse, $document, $rootScope, $positi
|
||||
}
|
||||
|
||||
if (scope.datepickerOptions) {
|
||||
angular.forEach(scope.datepickerOptions, function(value, option) {
|
||||
// Ignore this options, will be managed later
|
||||
if (['minDate', 'maxDate', 'minMode', 'maxMode', 'initDate', 'datepickerMode'].indexOf(option) === -1) {
|
||||
datepickerEl.attr(cameltoDash(option), value);
|
||||
} else {
|
||||
datepickerEl.attr(cameltoDash(option), 'datepickerOptions.' + option);
|
||||
}
|
||||
});
|
||||
datepickerEl.attr('datepicker-options', 'datepickerOptions');
|
||||
|
||||
if (angular.isDefined(scope.datepickerOptions.datepickerMode)) {
|
||||
datepickerEl.attr('datepicker-mode', 'datepickerOptions.datepickerMode');
|
||||
}
|
||||
}
|
||||
|
||||
angular.forEach(['minMode', 'maxMode', 'datepickerMode', 'shortcutPropagation'], function(key) {
|
||||
|
||||
@@ -2103,7 +2103,7 @@ describe('datepicker', function() {
|
||||
describe('show-weeks', function() {
|
||||
beforeEach(function() {
|
||||
$rootScope.opts = {
|
||||
'show-weeks': false
|
||||
showWeeks: false
|
||||
};
|
||||
var wrapElement = $compile('<div><input ng-model="date" uib-datepicker-popup datepicker-options="opts" is-open="true"></div>')($rootScope);
|
||||
$rootScope.$digest();
|
||||
@@ -2123,7 +2123,7 @@ describe('datepicker', function() {
|
||||
beforeEach(function() {
|
||||
$rootScope.date = null;
|
||||
$rootScope.opts = {
|
||||
'initDate': new Date('November 9, 1980')
|
||||
initDate: new Date('November 9, 1980')
|
||||
};
|
||||
var wrapElement = $compile('<div><input ng-model="date" uib-datepicker-popup datepicker-options="opts" is-open="true"></div>')($rootScope);
|
||||
$rootScope.$digest();
|
||||
|
||||
Reference in New Issue
Block a user