|
@@ -61157,7 +61157,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
|
|
|
|
|
|
function onWindowStateChanged(data) {
|
|
function onWindowStateChanged(data) {
|
|
if (_converse.chatboxviews) {
|
|
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,8 +62386,21 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
|
|
},
|
|
},
|
|
|
|
|
|
onWindowStateChanged(state) {
|
|
onWindowStateChanged(state) {
|
|
- if (this.model.get('num_unread', 0) && !this.model.isHidden()) {
|
|
|
|
- this.model.clearUnreadMsgCounter();
|
|
|
|
|
|
+ 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();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|