Merge pull request #133 from scottyallen/unread_in_title_favicon

Unread in title favicon
pull/140/head
Gabriel Engel 11 years ago
commit f19d7a421f
  1. 1
      .meteor/packages
  2. 1
      .meteor/versions
  3. 15
      client/startup/startup.coffee
  4. 2
      client/views/main.html

@ -49,3 +49,4 @@ http
rocket:file
pauli:accounts-linkedin
iframely:oembed
pierreeric:rxfavico

@ -85,6 +85,7 @@ pauli:accounts-linkedin@1.1.2
pauli:linkedin@1.1.2
percolate:migrations@0.7.5
percolatestudio:synced-cron@1.1.0
pierreeric:rxfavico@0.3.5_1
qnub:emojione@0.0.3
raix:handlebar-helpers@0.2.4
random@1.0.3

@ -80,7 +80,18 @@ Meteor.startup ->
removed: (data) ->
KonchatNotification.removeRoomNotification(data.rid)
updateUnread = (unreadCount) ->
rxFavico.set 'type', 'warn'
rxFavico.set 'count', unreadCount
if unreadCount > 0
document.title = '(' + unreadCount + ') Rocket.Chat'
else
document.title = 'Rocket.Chat'
ChatSubscription.find({}, { fields: { unread: 1 } }).observeChanges
added: (id, fields) ->
updateUnread(fields.unread)
changed: (id, fields) ->
if fields.unread and fields.unread > 0
@ -89,5 +100,7 @@ Meteor.startup ->
KonchatNotification.newMessage()
updateUnread(fields.unread)
# Add ascii support to emojione
emojione?.ascii = true
emojione?.ascii = true

@ -16,7 +16,7 @@
<meta name="msvalidate.01" content="CC595410A57B0314F81C928AE4E982C9" />
<meta name="msapplication-config" content="none"/>
<link rel="canonical" href="//rocket.chat/" />
<link rel="shortcut icon" href="/favicon.ico" sizes="16x16" type="image/x-icon" />
<link rel="shortcut icon" id="rxfavico" href="/favicon.ico?v=2" sizes="16x16" type="image/x-icon" />
<link rel="icon" href="/images/logo/16x16.png" sizes="16x16" type="image/png">
<link rel="icon" href="/images/logo/57x57.png" sizes="57x57" type="image/png">
<link rel="icon" href="/images/logo/75x75.png" sizes="75x75" type="image/png">

Loading…
Cancel
Save