Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixed message counter to be windowState aware.

Browse Source
This commit is contained in:
witek 2013-05-08 16:27:47 +02:00
parent 308b4c6bd6
commit 6078ab5924
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
converse.js
View File

@ -335,7 +335,7 @@
'extra_classes': message.get('delayed') && 'delayed' || '' 'extra_classes': message.get('delayed') && 'delayed' || ''
})); }));
} }
if (message.get('sender') != 'me') { if ((message.get('sender') != 'me') && (converse.windowState == 'blur')) {
converse.incrementMsgCounter(); converse.incrementMsgCounter();
} }
this.scrollDown(); this.scrollDown();
@ -480,7 +480,6 @@
if (this.model.get('status')) { if (this.model.get('status')) {
this.showStatusMessage(this.model.get('status')); this.showStatusMessage(this.model.get('status'));
} }
converse.clearMsgCounter();
}, },
template: _.template( template: _.template(
@ -956,7 +955,6 @@
this); this);
this.$el.appendTo(converse.chatboxesview.$el); this.$el.appendTo(converse.chatboxesview.$el);
this.render().show().model.messages.fetch({add: true}); this.render().show().model.messages.fetch({add: true});
converse.clearMsgCounter();
}, },
onLeave: function () { onLeave: function () {
@ -2121,6 +2119,14 @@
this.xmppstatus.initStatus(); this.xmppstatus.initStatus();
}, this)); }, this));
$(window).on("blur focus", $.proxy(function(e) {
if ((this.windowState != e.type) && (e.type == 'focus')) {
converse.clearMsgCounter();
}
this.windowState = e.type;
},this))
this.giveFeedback('Online Contacts'); this.giveFeedback('Online Contacts');
}; };