Merge pull request #64 from sendilkumarn/startNoOfDays

fix to date addition

Author: gavinbarron

angular-material-calendar.css

@@ -50,5 +50,3 @@ calendar-md {
       calendar-md md-content > md-content.calendar > :not(:first-child) > * :last-child {
         overflow: hidden;
         text-overflow: ellipsis; }
-      calendar-md md-content > md-content.calendar .currentDayHighlight {
-          background-color: #FCF8CD; }

angular-material-calendar.js

@@ -241,15 +241,21 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"
             $scope.dayTooltipFormat = $scope.dayTooltipFormat || "fullDate";
             $scope.disableFutureSelection = $scope.disableFutureSelection || false;
             $scope.disableSelection = $scope.disableSelection || false;
-            
+
             $scope.sameMonth = function (date) {
                 var d = angular.copy(date);
                 return d.getFullYear() === $scope.calendar.year &&
                     d.getMonth() === $scope.calendar.month;
             };
 
             $scope.isDisabled = function (date,startDateOfMonth,noOfDays) {
-                if (noOfDays!=0 && date.getDate() >= (startDateOfMonth+noOfDays)) {return true;}
+                if (noOfDays!=0 && angular.isDefined(noOfDays)) { 
+                    var dateStart = new Date($scope.calendar.year,$scope.calendar.month,startDateOfMonth);
+                    var dateEnd = angular.copy(dateStart);
+                    dateEnd.setDate(dateStart.getDate()+parseInt(noOfDays));
+                    if (date.getDate() <= dateStart && date.getDate() >= dateEnd) { return true; }
+                }
+                if ($scope.disableSelection) { return true; }
                 if ($scope.disableFutureSelection && date > new Date()) { return true; }
                 return !$scope.sameMonth(date);
             };
@@ -320,11 +326,11 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"
                 if($scope.disableFutureSelection && date > new Date()) {
                     return;
                 }
-                
+
                 if($scope.disableSelection) {
                     return;
                 }
-                
+
                 var active = angular.copy($scope.active);
                 if (angular.isArray(active)) {
                     var idx = dateFind(active, date);

angular-material-calendar.min.js

@@ -241,15 +241,21 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"
             $scope.dayTooltipFormat = $scope.dayTooltipFormat || "fullDate";
             $scope.disableFutureSelection = $scope.disableFutureSelection || false;
             $scope.disableSelection = $scope.disableSelection || false;
-            
+
             $scope.sameMonth = function (date) {
                 var d = angular.copy(date);
                 return d.getFullYear() === $scope.calendar.year &&
                     d.getMonth() === $scope.calendar.month;
             };
 
             $scope.isDisabled = function (date,startDateOfMonth,noOfDays) {
-                if (noOfDays!=0 && date.getDate() >= (startDateOfMonth+noOfDays)) {return true;}
+                if (noOfDays!=0 && angular.isDefined(noOfDays)) { 
+                    var dateStart = new Date($scope.calendar.year,$scope.calendar.month,startDateOfMonth);
+                    var dateEnd = angular.copy(dateStart);
+                    dateEnd.setDate(dateStart.getDate()+parseInt(noOfDays));
+                    if (date.getDate() <= dateStart && date.getDate() >= dateEnd) { return true; }
+                }
+                if ($scope.disableSelection) { return true; }
                 if ($scope.disableFutureSelection && date > new Date()) { return true; }
                 return !$scope.sameMonth(date);
             };
@@ -320,11 +326,11 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"
                 if($scope.disableFutureSelection && date > new Date()) {
                     return;
                 }
-                
+
                 if($scope.disableSelection) {
                     return;
                 }
-                
+
                 var active = angular.copy($scope.active);
                 if (angular.isArray(active)) {
                     var idx = dateFind(active, date);

dist/angular-material-calendar.js

@@ -249,7 +249,12 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"
             };
 
             $scope.isDisabled = function (date,startDateOfMonth,noOfDays) {
-                if (noOfDays!=0 && date.getDate() >= (startDateOfMonth+noOfDays)) { return true; }
+                if (noOfDays!=0 && angular.isDefined(noOfDays)) { 
+                    var dateStart = new Date($scope.calendar.year,$scope.calendar.month,startDateOfMonth);
+                    var dateEnd = angular.copy(dateStart);
+                    dateEnd.setDate(dateStart.getDate()+parseInt(noOfDays));
+                    if (date.getDate() <= dateStart && date.getDate() >= dateEnd) { return true; }
+                }
                 if ($scope.disableSelection) { return true; }
                 if ($scope.disableFutureSelection && date > new Date()) { return true; }
                 return !$scope.sameMonth(date);