Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed race condition of loading collections.

Browse source
This commit is contained in:
Martin Edenhofer 2013-08-20 23:11:59 +02:00
parent 6767970bab
commit 07677f297c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/lib/app_post/auth.js.coffee
View file

@ -83,6 +83,10 @@ class App.Auth
for key, value of data.session for key, value of data.session
App.Session.set( key, value ) App.Session.set( key, value )
# refresh default collections
for key, value of data.default_collections
App[key].refresh( value, options: { clear: true } )
App.Event.trigger( 'auth', data.session ) App.Event.trigger( 'auth', data.session )
# init of i18n # init of i18n
@ -93,10 +97,6 @@ class App.Auth
locale = window.navigator.userLanguage || window.navigator.language || 'en' locale = window.navigator.userLanguage || window.navigator.language || 'en'
App.i18n.set( locale ) App.i18n.set( locale )
# refresh default collections
for key, value of data.default_collections
App[key].refresh( value, options: { clear: true } )
App.Event.trigger( 'auth:login', data.session ) App.Event.trigger( 'auth:login', data.session )
App.Event.trigger( 'ui:rerender' ) App.Event.trigger( 'ui:rerender' )

2
app/assets/javascripts/app/lib/app_post/task_manager.js.coffee
View file

@ -371,7 +371,7 @@ class _taskManagerSingleton extends App.Controller
# reopen tasks # reopen tasks
App.Event.trigger 'taskbar:init' App.Event.trigger 'taskbar:init'
task_count = 0 task_count = 1
for task in @allTasks for task in @allTasks
task_count += 1 task_count += 1
console.log('START', task) console.log('START', task)