[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - loleaflet/js loleaflet/src

[Samuel Mehrbrodt (via logerrit)]

 loleaflet/js/toolbar.js              |    3 ++-
 loleaflet/src/layer/marker/Cursor.js |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ec165df75aa7c8f3b8fef9cc82cd0db23d4f1a78
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Sep 3 16:25:21 2020 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Sep 8 08:09:44 2020 +0200

    fix username formatting
    
    Inspired by bc0920178aef2bcb7affe989fa79309fe131aec4
    
    Change-Id: Ie82bccaf371b4c200c906125548eb24008e84c61
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102006
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 6ace95b08..78636e39a 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2303,10 +2303,11 @@ function setupToolbar(e) {
 	});
 
 	map.on('removeview', function(e) {
+		var username = this.escapeHtml(e.username);
 		$('#tb_toolbar-down_item_userlist')
 			.w2overlay({
 				class: 'loleaflet-font',
-				html: userLeftPopupMessage.replace('%user', e.username),
+				html: userLeftPopupMessage.replace('%user', username),
 				style: 'padding: 5px'
 			});
 		clearTimeout(userPopupTimeout);
diff --git a/loleaflet/src/layer/marker/Cursor.js b/loleaflet/src/layer/marker/Cursor.js
index 592658dca..6514fc4f2 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -81,7 +81,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() {