Merge branch 'master' into patch-3

fbertone · web-flow · commit 198bb9692b83 · 2016-07-25T20:34:24.000+02:00
diff --git a/src/angular-material-calendar.js b/src/angular-material-calendar.js
@@ -381,7 +381,7 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"
                     return $templateRequest($scope.templateUrl);
                 }
 
-                return $q.resolve($scope.template() || defaultTemplate);
+                return $q.when($scope.template() || defaultTemplate);
             };
 
 

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse"`
`381`	`381`	`return $templateRequest($scope.templateUrl);`
`382`	`382`	`}`
`383`	`383`
`384`		`- return $q.resolve($scope.template() \|\| defaultTemplate);`
	`384`	`+ return $q.when($scope.template() \|\| defaultTemplate);`
`385`	`385`	`};`
`386`	`386`
`387`	`387`