[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - loleaflet/src

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.UserList.js |    5 +++--
 loleaflet/src/layer/marker/Cursor.js      |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit bc0920178aef2bcb7affe989fa79309fe131aec4
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Sep 2 09:36:52 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 2 10:25:38 2020 +0200

    Fix name formatting
    
    Change-Id: I2aed56cf362c0e68918955340d35013179a54ad1
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101909
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101920
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.UserList.js b/loleaflet/src/control/Control.UserList.js
index 9a7c27386..a8aa8afc9 100644
--- a/loleaflet/src/control/Control.UserList.js
+++ b/loleaflet/src/control/Control.UserList.js
@@ -94,7 +94,7 @@ L.Control.UserList = L.Control.extend({
 			$(img).css({'background-color': color});
 		}
 	
-		nameTd.innerHTML = userName;
+		nameTd.textContent = userName;
 	
 		return content;
 	},
@@ -209,10 +209,11 @@ L.Control.UserList = L.Control.extend({
 
 	onRemoveView: function(e) {
 		var that = this;
+		var username = this.escapeHtml(e.username);
 		$('#tb_actionbar_item_userlist')
 			.w2overlay({
 				class: 'loleaflet-font',
-				html: this.options.userLeftPopupMessage.replace('%user', e.username),
+				html: this.options.userLeftPopupMessage.replace('%user', username),
 				style: 'padding: 5px'
 			});
 		clearTimeout(this.options.userPopupTimeout);
diff --git a/loleaflet/src/layer/marker/Cursor.js b/loleaflet/src/layer/marker/Cursor.js
index b7a0ba1a9..1d5708f18 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -91,7 +91,7 @@ L.Cursor = L.Layer.extend({
 		if (this.options.header) {
 			this._cursorHeader = L.DomUtil.create('div', 'leaflet-cursor-header', this._container);
 
-			this._cursorHeader.innerHTML = this.options.headerName;
+			this._cursorHeader.textContent = this.options.headerName;
 
 			clearTimeout(this._blinkTimeout);
 			this._blinkTimeout = setTimeout(L.bind(function() {