[Libreoffice-commits] online.git: loleaflet/src

Tomaž Vajngerl (via logerrit) logerrit at kemper.freedesktop.org
Mon Aug 31 11:28:56 UTC 2020


 loleaflet/src/layer/marker/Annotation.js |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 522a6b6978d01683898bfe1e683df3174dbce9eb
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Aug 31 10:29:03 2020 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Aug 31 13:28:38 2020 +0200

    add annotation marker only for presentations and draw documents
    
    Change-Id: I1bb69239a9ec6ce3c6fb33f38ff9bb99b305dbfe
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101692
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 797c2d432..bf1ca54d3 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -465,9 +465,11 @@ L.Annotation = L.Layer.extend({
 	},
 
 	_updateAnnotationMarker: function () {
+		// Make sure to place the markers only for presentations and draw documents
+		if (this._map._docLayer._docType !== 'presentation') 
+			return;
 		if (this._data == null)
 			return;
-
 		if (this._annotationMarker == null) {
 			this._annotationMarker = L.marker(new L.LatLng(0, 0), {
 				icon: L.divIcon({


More information about the Libreoffice-commits mailing list