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

Marco Cecchetti marco.cecchetti at collabora.com
Wed Apr 26 16:04:46 UTC 2017


 loleaflet/src/layer/tile/TileLayer.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a06a81e6316f0997e718d4d2d145fb5e5735ff29
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Wed Apr 26 11:38:27 2017 +0200

    loleaflet: Calc, Impress: should not show Reply entry in annotation menu
    
    There is no `reply` support in Desktop for Calc and Impress comments.
    
    Change-Id: I827ae99148cf8f65446e23e13e2588ce0ced788e
    Reviewed-on: https://gerrit.libreoffice.org/36980
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 6f7159e1..45f01484 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -184,8 +184,8 @@ L.TileLayer = L.GridLayer.extend({
 						that.onAnnotationModify.call(that, options.$trigger.get(0).annotation);
 					}
 				},
-				reply: {
-					name:_('Reply'),
+				reply: (this._docType !== 'text') ? undefined : {
+					name: _('Reply'),
 					callback: function (key, options) {
 						that.onAnnotationReply.call(that, options.$trigger.get(0).annotation);
 					}


More information about the Libreoffice-commits mailing list