Merge pull request #70 from Rossie/master

gavinbarron · gavinbarron · commit 62a8f0f5b864 · 2016-05-13T09:37:23.000-07:00
Fix null pointer error when none is selected.
diff --git a/src/angular-material-calendar.js b/src/angular-material-calendar.js
@@ -287,7 +287,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
`@@ -287,7 +287,7 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"`
`287`	`287`	`var match;`
`288`	`288`	`var active = angular.copy($scope.active);`
`289`	`289`	`if (!angular.isArray(active)) {`
`290`		`- if (angular.equals(active.getYear(), date.getYear()) && angular.equals(active.getMonth(), date.getMonth()) && angular.equals(active.getDate(), date.getDate())) {`
	`290`	`+ if (active && angular.equals(active.getYear(), date.getYear()) && angular.equals(active.getMonth(), date.getMonth()) && angular.equals(active.getDate(), date.getDate())) {`
`291`	`291`	`match = true;`
`292`	`292`	`}`
`293`	`293`	`} else {`