diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2020-08-26 04:06:24 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-08-28 12:05:24 +0200 |
| commit | bafef9a83cb9d7113dfdb854ade7f064d5634aa5 (patch) | |
| tree | 55c6e324d6cbd8a905defe50fb544b17c373b1f4 | |
| parent | loleaflet: Hyperlink textbox focus & content. (diff) | |
| download | online-bafef9a83cb9d7113dfdb854ade7f064d5634aa5.tar.gz online-bafef9a83cb9d7113dfdb854ade7f064d5634aa5.zip | |
leaflet: fixed show/hide comment in context menu
Change-Id: Ia18c92832c0dd0de5a09b6e434b4afe4ca9afb26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101458
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | loleaflet/src/control/Control.ContextMenu.js | 1 | ||||
| -rw-r--r-- | loleaflet/src/control/Control.JSDialogBuilder.js | 4 | ||||
| -rw-r--r-- | loleaflet/src/layer/tile/CalcTileLayer.js | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js index db34a56009..3f0a4c035a 100644 --- a/loleaflet/src/control/Control.ContextMenu.js +++ b/loleaflet/src/control/Control.ContextMenu.js @@ -78,7 +78,6 @@ L.Control.ContextMenu = L.Control.extend({ 'SpellingAndGrammarDialog', 'FontDialog', 'FontDialogForParagraph', // spreadsheet 'FormatCellDialog', - 'ShowNote', 'HideNote', 'DeleteNote', ] }, diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index fc3cf66441..a925b0a1fb 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -2129,6 +2129,10 @@ L.Control.JSDialogBuilder = L.Control.extend({ data.command.startsWith('.uno:InsertPageFooter')) && data.checked && data.checked === true) { return; + } else if (data.command === '.uno:ShowNote') { + builder.map._docLayer.showAnnotationFromCurrentCell(); + } else if (data.command === '.uno:HideNote') { + builder.map._docLayer.hideAnnotationFromCurrentCell(); } builder.map.sendUnoCommand(data.command); } diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js index 8960ddaf5c..11d0a47098 100644 --- a/loleaflet/src/layer/tile/CalcTileLayer.js +++ b/loleaflet/src/layer/tile/CalcTileLayer.js @@ -109,7 +109,7 @@ L.CalcTileLayer = L.TileLayer.extend({ var annotations = this._annotations[this._selectedPart]; for (var key in annotations) { var annotation = annotations[key]._annotation; - if (this._cellCursor.contains(annotation._data.cellPos)) { + if (this._cellCursor.intersects(annotation._data.cellPos)) { this._map.addLayer(annotation); annotation.show(); } |