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

Fixed issue #887 - Some notifications are marked as read initially.

Browse source
This commit is contained in:
Martin Edenhofer 2017-03-25 01:52:53 +01:00
parent 090c6b6d98
commit 07e966c7e2
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/assets/javascripts/app/controllers/widget/online_notification.coffee
View file

@ -218,18 +218,19 @@ class App.OnlineNotificationContentWidget extends App.CollectionController
for item in items for item in items
if !@alreadyShown[item.id] if !@alreadyShown[item.id]
@alreadyShown[item.id] = true @alreadyShown[item.id] = true
if @container.fetchedData if !item.seen
item = @prepareForObjectListItem(item) if @container.fetchedData
if item.objectNative && item.objectNative.activityMessage item = @prepareForObjectListItem(item)
title = item.objectNative.activityMessage(item) if item.objectNative && item.objectNative.activityMessage
else title = item.objectNative.activityMessage(item)
title = "Need objectNative in item #{item.object}.find(#{item.o_id})" else
title = App.Utils.html2text(title.replace(/<.+?>/g, '"')) title = "Need objectNative in item #{item.object}.find(#{item.o_id})"
@notifyDesktop( title = App.Utils.html2text(title.replace(/<.+?>/g, '"'))
url: item.link @notifyDesktop(
title: title url: item.link
) title: title
App.OnlineNotification.play() )
App.OnlineNotification.play()
onClick: => onClick: =>
@container.hide() @container.hide()