From ce6862e6a0184ad452ebb1f686250ca3c227f838 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 29 Mar 2013 22:15:19 +0100 Subject: [PATCH] Always poll for changes when user is syncing --- assets/scripts/app/auth.coffee | 4 ++++ assets/scripts/app/models/user.coffee | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index 28b0d9e6..bfd30825 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -13,6 +13,10 @@ Travis.setLocale Travis.default_locale @set('state', 'signed-out') @set('user', undefined) + user = Travis.__container__.lookup('controller:currentUser').get('content') + if user.get('stateManager.currentPath') == 'rootState.loaded.updated.uncommitted' + user.send('rollback') + user.unloadRecord() Travis.__container__.lookup('controller:currentUser').set('content', null) Travis.__container__.lookup('router:main').send('afterSignOut') diff --git a/assets/scripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee index a6f2779f..242ffb93 100644 --- a/assets/scripts/app/models/user.coffee +++ b/assets/scripts/app/models/user.coffee @@ -24,8 +24,8 @@ require 'travis/model' init: -> @_super() - # TODO: the next line fails, check this - #@poll() if @get('isSyncing') + Ember.run.next this, -> + @poll() if @get('isSyncing') Ember.run.next this, -> transaction = @get('store').transaction()