Skip to content
This repository was archived by the owner on Jun 5, 2020. It is now read-only.

Added a date-format attribute #33

Open
matias-sandell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added a date-format attribute #33

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
8 changes: 5 additions & 3 deletions src/angular-date-range-picker.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ angular.module("dateRangePicker").directive "dateRangePicker", ["$compile", "$ti
template: """
<span tabindex="0" ng-keydown="hide()" class="angular-date-range-picker__input">
<span ng-if="showRanged">
<span ng-show="!!model">{{ model.start.format("ll") }} - {{ model.end.format("ll") }}</span>
<span ng-show="!!model">{{ model.start.format(dateFormat) }} - {{ model.end.format(dateFormat) }}</span>
<span ng-hide="!!model">Select date range</span>
</span>
<span ng-if="!showRanged">
<span ng-show="!!model">{{ model.format("ll") }}</span>
<span ng-show="!!model">{{ model.format(dateFormat) }}</span>
<span ng-hide="!!model">Select date</span>
</span>
</span>
Expand All @@ -61,7 +61,8 @@ angular.module("dateRangePicker").directive "dateRangePicker", ["$compile", "$ti
customSelectOptions: "="
ranged: "="
pastDates: "@"
callback: "&"
callback: "&",
dateFormat: "@"

link: ($scope, element, attrs) ->
$scope.quickListDefinitions = $scope.customSelectOptions
Expand Down Expand Up @@ -107,6 +108,7 @@ angular.module("dateRangePicker").directive "dateRangePicker", ["$compile", "$ti
$scope.selecting = false
$scope.visible = false
$scope.start = null
$scope.dateFormat = $scope.dateFormat or "ll"
# Backward compatibility - if $scope.ranged is not set in the html, it displays normal date range picker.
$scope.showRanged = if $scope.ranged == undefined then true else $scope.ranged

Expand Down