summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-09-02 09:36:52 +0200
committerAndras Timar <andras.timar@collabora.com>2020-09-02 10:34:05 +0200
commita13d9673beb2596e90546b1588a874beccae31ff (patch)
tree5c2be5baa98bea87a1b8f91a3602379d0acb48e1
parentRemove default file descriptor limit. (diff)
downloadonline-a13d9673beb2596e90546b1588a874beccae31ff.tar.gz
online-a13d9673beb2596e90546b1588a874beccae31ff.zip
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@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101919 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--loleaflet/js/toolbar.js3
-rw-r--r--loleaflet/src/layer/marker/Cursor.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 94e96e020f..4e493bb507 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2396,10 +2396,11 @@ function onAddView(e) {
}
function onRemoveView(e) {
+ var username = escapeHtml(e.username);
$('#tb_actionbar_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 592658dca7..6514fc4f25 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() {