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

Fixes #1058 Send inactive CSN when user switches tab

Browse Source
This commit is contained in:
JC Brand 2018-10-16 13:30:29 +02:00
parent 09c3d30ccc
commit a8ef1d2904
4 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -7,6 +7,7 @@
- Don't show duplicate notification messages
- New config setting [show_images_inline](https://conversejs.org/docs/html/configuration.html#show-images-inline)
- #537 Render `xmpp:` URI as link
- #1058 Send an inactive chat state notification when the user switches to another tab
- #1062 Collapse multiple join/leave messages into one
- #1063 URLs in the topic / subject are not clickable
- #1140 Add support for destroyed chatrooms

21
dist/converse.js vendored
View File

@ -61157,7 +61157,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
function onWindowStateChanged(data) {
if (_converse.chatboxviews) {
_converse.chatboxviews.each(view => view.onWindowStateChanged(data.state));
_converse.chatboxviews.each(view => {
if (view.model.get('id') !== 'controlbox') {
view.onWindowStateChanged(data.state);
}
});
}
}
@ -62382,10 +62386,23 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
},
onWindowStateChanged(state) {
if (this.model.get('num_unread', 0) && !this.model.isHidden()) {
if (state === 'visible') {
if (!this.model.isHidden()) {
this.setChatState(_converse.ACTIVE);
if (this.model.get('num_unread', 0)) {
this.model.clearUnreadMsgCounter();
}
}
} else if (state === 'hidden') {
this.setChatState(_converse.INACTIVE, {
'silent': true
});
this.model.sendChatState();
_converse.connection.flush();
}
}
});

17
src/converse-chatview.js
View File

@ -91,7 +91,11 @@
function onWindowStateChanged (data) {
if (_converse.chatboxviews) {
_converse.chatboxviews.each(view => view.onWindowStateChanged(data.state));
_converse.chatboxviews.each(view => {
if (view.model.get('id') !== 'controlbox') {
view.onWindowStateChanged(data.state);
}
});
}
}
_converse.api.listen.on('windowStateChanged', onWindowStateChanged);
@ -1266,10 +1270,19 @@
},
onWindowStateChanged (state) {
if (this.model.get('num_unread', 0) && !this.model.isHidden()) {
if (state === 'visible') {
if (!this.model.isHidden()) {
this.setChatState(_converse.ACTIVE);
if (this.model.get('num_unread', 0)) {
this.model.clearUnreadMsgCounter();
}
}
} else if (state === 'hidden') {
this.setChatState(_converse.INACTIVE, {'silent': true});
this.model.sendChatState();
_converse.connection.flush();
}
}
});
_converse.on('chatBoxViewsInitialized', () => {

4
src/converse-singleton.js
View File

@ -55,8 +55,8 @@
}
if (_converse.isSingleton()) {
const any_chats_visible = _converse.chatboxes
.filter((cb) => cb.get('id') != 'controlbox')
.filter((cb) => !cb.get('hidden')).length > 0;
.filter(cb => cb.get('id') != 'controlbox')
.filter(cb => !cb.get('hidden')).length > 0;
if (any_chats_visible) {
return !chatbox.get('hidden');