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 @@
1notif = (title, html) ->1notif = (title, html) ->
2 html = html.replace /<a/g, '<a class="_notif-link"'2 html = html.replace /<a /g, '<a class="_notif-link" '
3 """<h5 class="_notif-title">#{title}</h5>#{html}<a href="#" class="_notif-close"></a>"""3 """<h5 class="_notif-title">#{title}</h5>#{html}<a href="#" class="_notif-close"></a>"""
4 4
5textNotif = (title, message) ->5textNotif = (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
4 @className += ' _notif-news'4 @className += ' _notif-news'
5 5
6 @defautOptions:6 @defautOptions:
7 autoHide: null7 autoHide: 30000
8 8
9 init: ->9 init: ->
10 @unreadNews = @getUnreadNews()10 @unreadNews = @getUnreadNews()
assets/javascripts/views/misc/notif.coffee+1−0
@@ -48,6 +48,7 @@ class app.views.Notif extends app.View · 47 unmodified lines
48 return48 return
49 49
50 onClick: (event) =>50 onClick: (event) =>
51 return if event.which isnt 1
51 if event.target.tagName isnt 'A' or event.target.classList.contains('_notif-close')52 if event.target.tagName isnt 'A' or event.target.classList.contains('_notif-close')
52 $.stopEvent(event)53 $.stopEvent(event)
53 @hide()54 @hide()
assets/javascripts/views/misc/updates.coffee+3−0
@@ -3,6 +3,9 @@ · 2 unmodified lines
3class app.views.Updates extends app.views.Notif3class app.views.Updates extends app.views.Notif
4 @className += ' _notif-news'4 @className += ' _notif-news'
5 5
6 @defautOptions:
7 autoHide: 30000
8
6 init: ->9 init: ->
7 @updatedDocs = @getUpdatedDocs()10 @updatedDocs = @getUpdatedDocs()
8 @show() if @updatedDocs.length11 @show() if @updatedDocs.length