Merge branch 'master' into startNoOfDays

sendilkumarn · sendilkumarn · commit e1bf22a8a219 · 2016-05-14T21:51:14.000+08:00
diff --git a/src/angular-material-calendar.js b/src/angular-material-calendar.js
@@ -292,7 +292,7 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"
                 var match;
                 var active = angular.copy($scope.active);
                 if (!angular.isArray(active)) {
-                    if (angular.equals(active.getYear(), date.getYear()) && angular.equals(active.getMonth(), date.getMonth()) && angular.equals(active.getDate(), date.getDate())) {
+                    if (active && angular.equals(active.getYear(), date.getYear()) && angular.equals(active.getMonth(), date.getMonth()) && angular.equals(active.getDate(), date.getDate())) {
                         match = true;
                     }
                 } else {

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"`
`292`	`292`	`var match;`
`293`	`293`	`var active = angular.copy($scope.active);`
`294`	`294`	`if (!angular.isArray(active)) {`
`295`		`- if (angular.equals(active.getYear(), date.getYear()) && angular.equals(active.getMonth(), date.getMonth()) && angular.equals(active.getDate(), date.getDate())) {`
	`295`	`+ if (active && angular.equals(active.getYear(), date.getYear()) && angular.equals(active.getMonth(), date.getMonth()) && angular.equals(active.getDate(), date.getDate())) {`
`296`	`296`	`match = true;`
`297`	`297`	`}`
`298`	`298`	`} else {`