From d5e89655dc167914309947f11f4da43f8d14f06c Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sun, 16 Dec 2018 11:32:19 +0100 Subject: [PATCH] Still check the view mode since the trimChats method is debounced --- dist/converse.js | 9 +++++++-- src/converse-minimize.js | 3 +++ src/headless/converse-core.js | 4 +--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dist/converse.js b/dist/converse.js index 63c882051..d56ccfac2 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -53177,6 +53177,10 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_1__["default"].plugins }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL)); const debouncedTrim = _.debounce(ev => { + if (_converse.view_mode !== 'overlayed') { + return; + } + if (_converse.connection.connected) { _converse.chatboxviews.trimChats(); } @@ -63451,11 +63455,12 @@ _converse.initialize = function (settings, callback) { }; this.registerGlobalEventHandlers = function () { - document.addEventListener("visibilitychange", _converse.saveWindowState); // set the initial state + document.addEventListener("visibilitychange", _converse.saveWindowState); _converse.saveWindowState({ 'type': document.hidden ? "blur" : "focus" - }); + }); // Set initial state + _converse.emit('registeredGlobalEventHandlers'); }; diff --git a/src/converse-minimize.js b/src/converse-minimize.js index 9712f9fdc..0cd9b81c5 100644 --- a/src/converse-minimize.js +++ b/src/converse-minimize.js @@ -518,6 +518,9 @@ converse.plugins.add('converse-minimize', { const debouncedTrim = _.debounce(ev => { + if (_converse.view_mode !== 'overlayed') { + return; + } if (_converse.connection.connected) { _converse.chatboxviews.trimChats(); } diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js index 913763dcf..a6fdb99ab 100644 --- a/src/headless/converse-core.js +++ b/src/headless/converse-core.js @@ -851,9 +851,7 @@ _converse.initialize = function (settings, callback) { this.registerGlobalEventHandlers = function () { document.addEventListener("visibilitychange", _converse.saveWindowState); - - // set the initial state - _converse.saveWindowState({'type': document.hidden ? "blur" : "focus"}); + _converse.saveWindowState({'type': document.hidden ? "blur" : "focus"}); // Set initial state _converse.emit('registeredGlobalEventHandlers'); };