loleaflet/dist/loleaflet.css | 6 ------
loleaflet/src/layer/tile/CalcTileLayer.js | 12 ------------
2 files changed, 18 deletions(-)
New commits:
commit 4e7d3321d9872c849b6695e940e8b4ec864040bb
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Apr 27 10:27:54 2017 +0530
loleaflet: Bin client side cell annotation marker
No need as core renders its in-tile annotation marker now, if comment
indicator setting is on in the document.
Change-Id: I213827fc089790398e02b0fd9cba464ab62b0d8d
(cherry picked from commit 56c49af98a14cb7098849c046c32a181f6761e11)
Reviewed-on: https://gerrit.libreoffice.org/37013
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index b637a217..dd7ddb59 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -191,12 +191,6 @@ body {
width: 95%;
}
-.loleaflet-cell-annotation {
- background: red;
- border: 1px solid red;
- pointer-events: none;
-}
-
.loleaflet-div-layer {
position: absolute;
left: 0;
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 8db36a7a..b495b467 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -34,16 +34,6 @@ L.CalcTileLayer = L.TileLayer.extend({
createAnnotation: function (comment) {
var annotation =
L.divOverlay(comment.cellPos).bindAnnotation(L.annotation(L.latLng(0, 0),
comment, comment.id === 'new' ? {noMenu: true} : {}));
- annotation.mark = L.marker(comment.cellPos.getNorthEast(), {
- draggable: false,
- clickable: false,
- keyboard: false,
- icon: L.divIcon({
- iconSize: L.point(2, 2),
- iconAnchor: L.point(4, 0),
- className: 'loleaflet-cell-annotation'
- })
- });
return annotation;
},
@@ -94,12 +84,10 @@ L.CalcTileLayer = L.TileLayer.extend({
},
showAnnotation: function (annotation) {
- this._map.addLayer(annotation.mark);
this._map.addLayer(annotation);
},
hideAnnotation: function (annotation) {
- this._map.removeLayer(annotation.mark);
this._map.removeLayer(annotation);
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
