[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

gokaysatir (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 11 20:59:03 UTC 2020


 loleaflet/src/layer/tile/TileLayer.js |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 53ef2d33d00b51d44ab3370771ec8f23c69d760e
Author:     gokaysatir <gokaysatir at collabora.com>
AuthorDate: Fri Jul 10 23:36:10 2020 +0300
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue Aug 11 22:58:44 2020 +0200

    loleaflet: Remove carret marker when text selected.
    
    Change-Id: Ifc055f852857188e4d35b9db1db62638ad5a27a5
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98546
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    (cherry picked from commit e5dfd6a2f27450007f11ff017d919ab69422c665)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100363
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 0e1845706..726a5a5b2 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1668,6 +1668,7 @@ L.TileLayer = L.GridLayer.extend({
 				weight: 2,
 				opacity: 0.25});
 			this._selections.addLayer(selection);
+			this._map.removeLayer(this._map._textInput._cursorHandler); // User selected a text, we remove the carret marker.
 			if (this._selectionContentRequest) {
 				clearTimeout(this._selectionContentRequest);
 			}


More information about the Libreoffice-commits mailing list