Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
feat(datepicker): pass options from popup to inline
- Pass through options object wholesale from popup to inline datepicker

BREAKING CHANGE: This breaks any snake-cased key usage, i.e.
`show-weeks`. Convert all keys used to camelCase.
  • Loading branch information
wesleycho committed Jan 27, 2016
commit d5f3f069f1b491269c61f8d7648677de446d552b
13 changes: 5 additions & 8 deletions src/datepicker/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/datepicker/test/datepicker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down