Skip to content

Commit 21ff8a3

Browse files
committed
Merge branch 'develop'
2 parents b8afb13 + ac91993 commit 21ff8a3

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-datetime-inputs",
3-
"version": "0.1.24",
3+
"version": "0.1.25",
44
"description": "UI elements for datetime input, converted to angular directives for your convenience.",
55
"homepage": "https://github.com/g1eb/angular-datetime-inputs",
66
"authors": [

dist/datetime-inputs.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-datetime-inputs",
3-
"version": "0.1.24",
3+
"version": "0.1.25",
44
"description": "UI elements for datetime input, converted to angular directives for your convenience.",
55
"homepage": "https://github.com/g1eb/angular-datetime-inputs#readme",
66
"author": "gleb",

src/date-input.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
'active': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).startOf('day').isSame(selected.clone().startOf('day')),
2929
'inactive': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month() !== calendar.month()
3030
}"
31-
ng-disabled="(!!minDate && calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date().isBefore(minDate.date())) || (!!maxDate && calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date().isAfter(maxDate.date()))"
3231
ng-click="update(selected.clone().year(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).year()).month(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month()).date(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date()), true)"
3332
ng-bind="calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date()"></span>
3433
</div>

0 commit comments

Comments
 (0)