From bde1b9529ba84d2f2ec986f622085f0fadabe57a Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Mon, 25 Mar 2019 16:35:26 +0100 Subject: [PATCH] Minimized bookmarked chatboxes should not be always maximized after page reload This is a fix for https://github.com/conversejs/converse.js/issues/1508 --- CHANGES.md | 2 +- dist/converse.js | 2 +- src/converse-bookmarks.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5ad9b46f9..34f91ab2a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,7 +24,7 @@ - #1487: New config option [muc_respect_autojoin](https://conversejs.org/docs/html/configuration.html#muc-respect-autojoin) - #1501: Don't prompt for a reason if [auto_join_on_invite](https://conversejs.org/docs/html/configuration.html#auto-join-on-invite) is `true` - #1507: Make message id and origin-id identical in order to fix LMC with Conversations - +- #1508: Minimized bookmarked chatboxes should not be always maximized after page reload. ## 4.1.2 (2019-02-22) diff --git a/dist/converse.js b/dist/converse.js index 79a66c29e..71fced76c 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -48733,7 +48733,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins if (_converse.muc_respect_autojoin && bookmark.get('autojoin')) { const groupchat = _converse.api.rooms.create(bookmark.get('jid'), bookmark.get('nick')); - if (!groupchat.get('hidden')) { + if (!groupchat.get('hidden') && !groupchat.get('minimized')) { groupchat.trigger('show'); } } diff --git a/src/converse-bookmarks.js b/src/converse-bookmarks.js index 7e4903675..c10150a64 100644 --- a/src/converse-bookmarks.js +++ b/src/converse-bookmarks.js @@ -253,7 +253,7 @@ converse.plugins.add('converse-bookmarks', { openBookmarkedRoom (bookmark) { if ( _converse.muc_respect_autojoin && bookmark.get('autojoin')) { const groupchat = _converse.api.rooms.create(bookmark.get('jid'), bookmark.get('nick')); - if (!groupchat.get('hidden')) { + if (!groupchat.get('hidden') && !groupchat.get('minimized')) { groupchat.trigger('show'); } }