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

New commits:
commit a13d9673beb2596e90546b1588a874beccae31ff
Author:     Szymon Kłos <[email protected]>
AuthorDate: Wed Sep 2 09:36:52 2020 +0200
Commit:     Andras Timar <[email protected]>
CommitDate: Wed Sep 2 10:34:05 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 <[email protected]>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101919
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Reviewed-by: Andras Timar <[email protected]>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 94e96e020..4e493bb50 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 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() {
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to