[Libreoffice-commits] online.git: loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 592b4c231663cf1c774cb4395ac6ae97a6d83791
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Mar 26 21:00:31 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Mar 27 13:25:16 2020 +0100

    user list: Make sure the events are set.
    
    The avoidance of the busy loop also avoided setting the events; so the
    list of users was always showing 0 because it never got the add/remove
    events.
    
    Change-Id: I397f30ceb6f0ab305fc01b9ef1183925f30d529d
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91154
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index f3dc74503..906fd3100 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1425,14 +1425,20 @@ L.TileLayer = L.GridLayer.extend({
 				(window.mode.isMobile() && $.inArray('mobile', map['wopi'].HideUserList) >= 0) ||
 				(window.mode.isTablet() && $.inArray('tablet', map['wopi'].HideUserList) >= 0));
 
-		// Otherwise we can get an infinte, fast busy timeout loop.
-		if (toolbar.get('userlist').hidden == hideUserList)
-			return;
-
 		map.off('deselectuser', window.deselectUser);
 		map.off('addview', window.onAddView);
 		map.off('removeview', window.onRemoveView);
 
+		if (!hideUserList) {
+			map.on('deselectuser', window.deselectUser);
+			map.on('addview', window.onAddView);
+			map.on('removeview', window.onRemoveView);
+		}
+
+		// Otherwise we can get an infinte, fast busy timeout loop.
+		if (toolbar.get('userlist').hidden === hideUserList)
+			return;
+
 		if (hideUserList) {
 			toolbar.hide('userlist');
 			toolbar.hide('userlistbreak');
@@ -1440,9 +1446,6 @@ L.TileLayer = L.GridLayer.extend({
 		else {
 			toolbar.show('userlist');
 			toolbar.show('userlistbreak');
-			map.on('deselectuser', window.deselectUser);
-			map.on('addview', window.onAddView);
-			map.on('removeview', window.onRemoveView);
 		}
 	},