haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop follow user feature if a key has been pressed by the original user. 

Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com>
Change-Id: Ibfd160fd8fb80a9dfd4c71dfb9a4a2725be48465
pull/5199/head
Gülşah Köse 2022-08-30 10:32:20 +03:00 committed by pedropintosilva
parent cb01192023
commit d78bad959e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/src/control/Control.UIManager.js
View File

@ -96,7 +96,8 @@ L.Control.UIManager = L.Control.extend({
this.map.addControl(this.map.dialog);
this.map.addControl(L.control.contextMenu());
this.map.addControl(L.control.infobar());
this.map.addControl(L.control.userList());
this.map.userList = L.control.userList();
this.map.addControl(this.map.userList);
var openBusyPopup = function(label) {
this.busyPopupTimer = setTimeout(function() {

6
browser/src/map/handler/Map.Keyboard.js
View File

@ -454,6 +454,12 @@ L.Map.Keyboard = L.Handler.extend({
}
}
// if any key is pressed, we stop the following other user feature.
if (this._map._docLayer._followUser) {
this._map.userList.followUser(this._map._docLayer._viewId);
}
L.DomEvent.stopPropagation(ev);
},