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

fix(datepicker): inject dateFilter instead of $filter #463

Closed
wants to merge 1 commit into from
Closed

fix(datepicker): inject dateFilter instead of $filter #463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/datepicker/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ angular.module('ui.bootstrap.datepicker', [])
yearRange: 20
})

.directive( 'datepicker', ['$filter', '$parse', 'datepickerConfig', function ($filter, $parse, datepickerConfig) {
.directive( 'datepicker', ['dateFilter', '$parse', 'datepickerConfig', function (dateFilter, $parse, datepickerConfig) {
return {
restrict: 'EA',
replace: true,
Expand Down Expand Up @@ -101,7 +101,7 @@ angular.module('ui.bootstrap.datepicker', [])

function addDays( dt, n, isCurrentMonth ) {
for (var i =0; i < n; i ++) {
days.push( {date: new Date(dt), isCurrent: isCurrentMonth, isSelected: isSelected(dt), label: $filter('date')(dt, format.day), disabled: isDisabled(dt) } );
days.push( {date: new Date(dt), isCurrent: isCurrentMonth, isSelected: isSelected(dt), label: dateFilter(dt, format.day), disabled: isDisabled(dt) } );
dt.setDate( dt.getDate() + 1 );
}
lastDate = dt;
Expand All @@ -122,23 +122,23 @@ angular.module('ui.bootstrap.datepicker', [])

// Day labels
for (i = 0; i < 7; i++) {
labels.push( $filter('date')(days[i].date, format.dayHeader) );
labels.push( dateFilter(days[i].date, format.dayHeader) );
}
updateCalendar( split( days, 7 ), labels, $filter('date')(selected, format.dayTitle) );
updateCalendar( split( days, 7 ), labels, dateFilter(selected, format.dayTitle) );
},
month: function() {
var months = [], i = 0, year = selected.getFullYear();
while ( i < 12 ) {
var dt = new Date(year, i++, 1);
months.push( {date: dt, isCurrent: true, isSelected: isSelected(dt), label: $filter('date')(dt, format.month), disabled: isDisabled(dt)} );
months.push( {date: dt, isCurrent: true, isSelected: isSelected(dt), label: dateFilter(dt, format.month), disabled: isDisabled(dt)} );
}
updateCalendar( split( months, 3 ), [], $filter('date')(selected, format.monthTitle) );
updateCalendar( split( months, 3 ), [], dateFilter(selected, format.monthTitle) );
},
year: function() {
var years = [], year = parseInt((selected.getFullYear() - 1) / yearRange, 10) * yearRange + 1;
for ( var i = 0; i < yearRange; i++ ) {
var dt = new Date(year + i, 0, 1);
years.push( {date: dt, isCurrent: true, isSelected: isSelected(dt), label: $filter('date')(dt, format.year), disabled: isDisabled(dt)} );
years.push( {date: dt, isCurrent: true, isSelected: isSelected(dt), label: dateFilter(dt, format.year), disabled: isDisabled(dt)} );
}
var title = years[0].label + ' - ' + years[years.length - 1].label;
updateCalendar( split( years, 5 ), [], title );
Expand Down