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

[Jan Holesovsky (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js    |   13 +------------
 loleaflet/src/layer/tile/ImpressTileLayer.js |   13 +------------
 loleaflet/src/layer/tile/TileLayer.js        |   23 +++++++++++++++++++++++
 loleaflet/src/layer/tile/WriterTileLayer.js  |   13 +------------
 4 files changed, 26 insertions(+), 36 deletions(-)

New commits:
commit e8b5f75ebe838fcebceddb9bf8590efb28cc8007
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Dec 3 15:52:32 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Dec 3 17:22:00 2019 +0100

    mobile: Don't show the user list in the native app.
    
    Change-Id: I71df72e420f27e5bd10487a70545f24a5d93269b
    Reviewed-on: https://gerrit.libreoffice.org/84365
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 6963e04a9..3d39bac9c 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -130,18 +130,7 @@ L.CalcTileLayer = L.TileLayer.extend({
 				window.hideTooltip(this, e.target);
 			},
 			onRefresh: function() {
-				var showUserList = map['wopi'].HideUserList !== null &&
-									map['wopi'].HideUserList !== undefined &&
-									$.inArray('true', map['wopi'].HideUserList) < 0 &&
-									((window.mode.isMobile() && $.inArray('mobile', map['wopi'].HideUserList) < 0) ||
-									(window.mode.isTablet() && $.inArray('tablet', map['wopi'].HideUserList) < 0));
-				if (this.get('userlist').hidden == true && showUserList) {
-					this.show('userlist');
-					this.show('userlistbreak');
-					map.on('deselectuser', window.deselectUser);
-					map.on('addview', window.onAddView);
-					map.on('removeview', window.onRemoveView);
-				}
+				L.TileLayer.prototype._onUserListRefresh(map, this);
 			}
 		});
 		toolbar.bind('touchstart', function(e) {
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 632dc51ce..5b4fd90aa 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -170,18 +170,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
 				window.hideTooltip(this, e.target);
 			},
 			onRefresh: function() {
-				var showUserList = map['wopi'].HideUserList !== null &&
-									map['wopi'].HideUserList !== undefined &&
-									$.inArray('true', map['wopi'].HideUserList) < 0 &&
-									((window.mode.isMobile() && $.inArray('mobile', map['wopi'].HideUserList) < 0) ||
-									(window.mode.isTablet() && $.inArray('tablet', map['wopi'].HideUserList) < 0));
-				if (this.get('userlist').hidden == true && showUserList) {
-					this.show('userlist');
-					this.show('userlistbreak');
-					map.on('deselectuser', window.deselectUser);
-					map.on('addview', window.onAddView);
-					map.on('removeview', window.onRemoveView);
-				}
+				L.TileLayer.prototype._onUserListRefresh(map, this);
 			}
 		});
 		toolbar.bind('touchstart', function(e) {
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index d2bee6cf1..7a62ff8d8 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1356,6 +1356,29 @@ L.TileLayer = L.GridLayer.extend({
 		this._map.fire('updateviewslist');
 	},
 
+	_onUserListRefresh: function(map, toolbar) {
+		var showUserList = map['wopi'].HideUserList !== null &&
+							map['wopi'].HideUserList !== undefined &&
+							$.inArray('true', map['wopi'].HideUserList) < 0 &&
+							!window.ThisIsAMobileApp &&
+							((window.mode.isMobile() && $.inArray('mobile', map['wopi'].HideUserList) < 0) ||
+							(window.mode.isTablet() && $.inArray('tablet', map['wopi'].HideUserList) < 0));
+		map.off('deselectuser', window.deselectUser);
+		map.off('addview', window.onAddView);
+		map.off('removeview', window.onRemoveView);
+		if (showUserList) {
+			toolbar.show('userlist');
+			toolbar.show('userlistbreak');
+			map.on('deselectuser', window.deselectUser);
+			map.on('addview', window.onAddView);
+			map.on('removeview', window.onRemoveView);
+		}
+		else {
+			toolbar.hide('userlist');
+			toolbar.hide('userlistbreak');
+		}
+	},
+
 	_onRenderFontMsg: function (textMsg, img) {
 		var command = this._map._socket.parseServerCmd(textMsg);
 		this._map.fire('renderfont', {
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js b/loleaflet/src/layer/tile/WriterTileLayer.js
index f8cdbd7fe..7bf6759bd 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -113,18 +113,7 @@ L.WriterTileLayer = L.TileLayer.extend({
 				window.hideTooltip(this, e.target);
 			},
 			onRefresh: function() {
-				var showUserList = map['wopi'].HideUserList !== null &&
-									map['wopi'].HideUserList !== undefined &&
-									$.inArray('true', map['wopi'].HideUserList) < 0 &&
-									((window.mode.isMobile() && $.inArray('mobile', map['wopi'].HideUserList) < 0) ||
-									(window.mode.isTablet() && $.inArray('tablet', map['wopi'].HideUserList) < 0));
-				if (this.get('userlist').hidden == true && showUserList) {
-					this.show('userlist');
-					this.show('userlistbreak');
-					map.on('deselectuser', window.deselectUser);
-					map.on('addview', window.onAddView);
-					map.on('removeview', window.onRemoveView);
-				}
+				L.TileLayer.prototype._onUserListRefresh(map, this);
 			}
 		});
 		toolbar.bind('touchstart', function(e) {