From 46bfe6befbd9065285c21c37cdc987fcbeedc1b9 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 19 May 2015 16:50:26 -0400
Subject: [PATCH] (fix) Resolve component data completely

---
 UI/WebServerResources/js/Scheduler.app.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler.app.js b/UI/WebServerResources/js/Scheduler.app.js
index 014b16e90..0a03d2f68 100644
--- a/UI/WebServerResources/js/Scheduler.app.js
+++ b/UI/WebServerResources/js/Scheduler.app.js
@@ -141,9 +141,15 @@
   /**
    * @ngInject
    */
-  stateComponent.$inject = ['$stateParams', 'Calendar'];
-  function stateComponent($stateParams, Calendar) {
-    return Calendar.$get($stateParams.calendarId).$getComponent($stateParams.componentId);
+  stateComponent.$inject = ['$q', '$stateParams', 'Calendar'];
+  function stateComponent($q, $stateParams, Calendar) {
+    var component = Calendar.$get($stateParams.calendarId).$getComponent($stateParams.componentId);
+
+    return $q(function(resolve, reject) {
+      component.$futureComponentData.then(function() {
+        resolve(component);
+      }, reject);
+    });
   }
 
   /**