Merge branch 'develop'

g1eb · Jan 13, 2017 · 21ff8a3 · 21ff8a3
2 parents b8afb13 + ac91993
commit 21ff8a3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-datetime-inputs",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "UI elements for datetime input, converted to angular directives for your convenience.",
   "homepage": "https://github.com/g1eb/angular-datetime-inputs",
   "authors": [

diff --git a/dist/datetime-inputs.min.js b/dist/datetime-inputs.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-datetime-inputs",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "UI elements for datetime input, converted to angular directives for your convenience.",
   "homepage": "https://github.com/g1eb/angular-datetime-inputs#readme",
   "author": "gleb",

diff --git a/src/date-input.html b/src/date-input.html
@@ -28,7 +28,6 @@
               'active': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).startOf('day').isSame(selected.clone().startOf('day')),
               'inactive': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month() !== calendar.month()
             }"
-            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()))"
             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)"
             ng-bind="calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date()"></span>
         </div>