[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 2 commits - loleaflet/js wsd/Storage.hpp

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |   35 +++++++++++++++++++++++++++++++++++
 wsd/Storage.hpp         |    2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit e86c3326d2d38ace0c28f2e3c6e4a8984295b7d1
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sat Dec 15 16:11:00 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Dec 15 16:14:29 2018 +0100

    loleaflet: two missing functions: deselectUser, onRemoveView
    
    Change-Id: I99354e1667baba5f0f1ce10d64e597364057d46c
    (cherry picked from commit 982777ec3812395145681b36c3980ddc6d5c063d)

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 9ed53ec2a..3991ae1be 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2336,6 +2336,15 @@ function selectUser(viewId) {
 	$('#tb_actionbar_item_userlist').w2overlay('');
 }
 
+function deselectUser(e) {
+	var userlistItem = w2ui['actionbar'].get('userlist');
+	if (userlistItem === null) {
+		return;
+	}
+
+	userlistItem.html = $(userlistItem.html).find('#user-' + e.viewId).removeClass('selected-user').parent().parent().parent()[0].outerHTML;
+}
+
 function getUserItem(viewId, userName, extraInfo, color) {
 	var className = 'useritem';
 	if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
@@ -2416,6 +2425,32 @@ function onAddView(e) {
 	}
 }
 
+function onRemoveView(e) {
+	$('#tb_actionbar_item_userlist')
+		.w2overlay({
+			class: 'loleaflet-font',
+			html: userLeftPopupMessage.replace('%user', e.username),
+			style: 'padding: 5px'
+		});
+	clearTimeout(userPopupTimeout);
+	userPopupTimeout = setTimeout(function() {
+		$('#tb_actionbar_item_userlist').w2overlay('');
+		clearTimeout(userPopupTimeout);
+		userPopupTimeout = null;
+	}, 3000);
+
+	if (e.viewId === map._docLayer._followThis) {
+		map._docLayer._followThis = -1;
+		map._docLayer._followUser = false;
+	}
+
+	var userlistItem = w2ui['actionbar'].get('userlist');
+	if (userlistItem !== null) {
+		userlistItem.html = $(userlistItem.html).find('#user-' + e.viewId).remove().end()[0].outerHTML;
+		updateUserListCount();
+	}
+}
+
 $(window).resize(function() {
 	resizeToolbar();
 });
commit 9c86f202dd322e9f7df02e463e773cd808d4c488
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sat Dec 15 15:57:57 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Dec 15 16:14:21 2018 +0100

    fixup of 892117eb37b8
    
    Change-Id: I071cb197ebdc9b39026a0ef100720809779bfb2b
    (cherry picked from commit 2e33cdb9c17db5b65de845bb9ac0f156e665e07c)

diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 467deea40..3591ac8b1 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -393,7 +393,7 @@ public:
 
         bool getEnableShare() const { return _enableShare; }
 
-        std::string& getHideUserList() const { return _hideUserList; }
+        std::string& getHideUserList() { return _hideUserList; }
 
         TriState getDisableChangeTrackingShow() const { return _disableChangeTrackingShow; }