From b27977baaa0eb08838640c0b0c2032bab020a93a Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 30 Apr 2015 14:04:07 +0200
Subject: [PATCH] Make polling play nice with promises

---
 app/mixins/polling.coffee | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/mixins/polling.coffee b/app/mixins/polling.coffee
index b55b7c1b..6e8638b7 100644
--- a/app/mixins/polling.coffee
+++ b/app/mixins/polling.coffee
@@ -25,9 +25,15 @@ mixin = Ember.Mixin.create
     @stopPollingModel(key)
 
   pollModel: (property) ->
-    model = @get(property)
+    addToPolling = (model) =>
+      @get('polling').startPolling(model)
 
-    @get('polling').startPolling(model)
+    if model = @get(property)
+      if model.then
+        model.then (resolved) ->
+          addToPolling(resolved)
+      else
+        addToPolling(model)
 
   stopPollingModel: (property) ->
     model = @get(property)