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

Renamed to taskbar_id.

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-17 10:41:18 +02:00
parent c52ab26d5f
commit ceff0d4aba
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/task_widget.js.coffee
View file

@ -37,7 +37,7 @@ class App.TaskWidget extends App.Controller
if !@error if !@error
# only if new client id isnt own client id # only if new client id isnt own client id
if data.client_id isnt App.TaskManager.clientId() if data.taskbar_id isnt App.TaskManager.TaskbarId()
@error = new App.SessionReloadModal( @error = new App.SessionReloadModal(
title: 'Session' title: 'Session'
message: 'Session taken over... please reload page or work with other browser window.' message: 'Session taken over... please reload page or work with other browser window.'

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

@ -54,10 +54,10 @@ class App.TaskManager
_instance ?= new _Singleton _instance ?= new _Singleton
_instance.workerAll() _instance.workerAll()
@clientId: -> @TaskbarId: ->
if _instance == undefined if _instance == undefined
_instance ?= new _Singleton _instance ?= new _Singleton
_instance.clientId() _instance.TaskbarId()
class _Singleton extends App.Controller class _Singleton extends App.Controller
@include App.Log @include App.Log
@ -247,10 +247,10 @@ class _Singleton extends App.Controller
App.Taskbar.deleteAll() App.Taskbar.deleteAll()
App.Event.trigger 'task:render' App.Event.trigger 'task:render'
clientId: => TaskbarId: =>
if !@clientIdInt if !@TaskbarIdInt
@clientIdInt = Math.floor( Math.random() * 99999999 ) @TaskbarIdInt = Math.floor( Math.random() * 99999999 )
@clientIdInt @TaskbarIdInt
tasksInitial: => tasksInitial: =>
# reopen tasks # reopen tasks
@ -266,7 +266,7 @@ class _Singleton extends App.Controller
data: data:
recipient: recipient:
user_id: [ App.Session.get( 'id' ) ] user_id: [ App.Session.get( 'id' ) ]
client_id: @clientId() taskbar_id: @TaskbarId()
) )
# App.Taskbar.fetch() # App.Taskbar.fetch()