History

Small improvements to notifications

Thibaut Courouble committed 10 years ago

Commit 4c2a5561 parent 7aab65b7 files · +13 −5Browse files

Showing the changes to assets/javascripts (4 of 7 files). Show all

Unified · Split

4 files
  1. assets/javascripts/templates/notif_tmpl.coffee +1 −1
  2. assets/javascripts/views/misc/news.coffee +1 −1
  3. assets/javascripts/views/misc/notif.coffee +1 −0
  4. assets/javascripts/views/misc/updates.coffee +3 −0
assets/javascripts/templates/notif_tmpl.coffee+1−1
@@ -1,5 +1,5 @@
11 notif = (title, html) ->
2− html = html.replace /<a/g, '<a class="_notif-link"'
2+ html = html.replace /<a /g, '<a class="_notif-link" '
33 """<h5 class="_notif-title">#{title}</h5>#{html}<a href="#" class="_notif-close"></a>"""
44
55 textNotif = (title, message) ->
assets/javascripts/views/misc/news.coffee+1−1
@@ -4,7 +4,7 @@ class app.views.News extends app.views.Notif · 3 unmodified lines
44 @className += ' _notif-news'
55
66 @defautOptions:
7− autoHide: null
7+ autoHide: 30000
88
99 init: ->
1010 @unreadNews = @getUnreadNews()
assets/javascripts/views/misc/notif.coffee+1−0
@@ -48,6 +48,7 @@ class app.views.Notif extends app.View · 47 unmodified lines
4848 return
4949
5050 onClick: (event) =>
51+ return if event.which isnt 1
5152 if event.target.tagName isnt 'A' or event.target.classList.contains('_notif-close')
5253 $.stopEvent(event)
5354 @hide()
assets/javascripts/views/misc/updates.coffee+3−0
@@ -3,6 +3,9 @@ · 2 unmodified lines
33 class app.views.Updates extends app.views.Notif
44 @className += ' _notif-news'
55
6+ @defautOptions:
7+ autoHide: 30000
8+
69 init: ->
710 @updatedDocs = @getUpdatedDocs()
811 @show() if @updatedDocs.length