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

[Pranav Kant]

 loleaflet/src/layer/AnnotationManager.js |    1 -
 loleaflet/src/layer/marker/Annotation.js |    5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d5cdd776cf21487fbf213fde5b1c3dfc745b8f96
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Apr 27 14:06:04 2017 +0530

    loleaflet: Fix replying comment behavior on IE
    
    Change-Id: If56d217073e88ed7bc554383dc3bad059b4ef305

diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 44e41751..93c71983 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -266,7 +266,10 @@ L.Annotation = L.Layer.extend({
 	_onReplyClick: function (e) {
 		L.DomEvent.stopPropagation(e);
 		this._data.reply = this._nodeReplyText.value;
-		this._nodeReplyText.value = null;
+		// Assigning an empty string to .innerHTML property in some browsers will convert it to 'null'
+		// While in browsers like Chrome and Firefox, a null value is automatically converted to ''
+		// Better to assign '' here instead of null to keep the behavior same for all
+		this._nodeReplyText.value = '';
 		this.show();
 		this._map.fire('AnnotationReply', {annotation: this});
 	},
commit bc180ed370119ee7190dce3a8bb95577e85b331f
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Apr 27 13:30:23 2017 +0530

    Bin unused animation object
    
    Change-Id: I66d4716ba2bfac5797d8a0e7213479abd3eb3467

diff --git a/loleaflet/src/layer/AnnotationManager.js b/loleaflet/src/layer/AnnotationManager.js
index f35c7588..76f91341 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -14,7 +14,6 @@ L.AnnotationManager = L.Class.extend({
 		this._map = map;
 		this._items = [];
 		this._selected = null;
-		this._animation = new L.PosAnimation();
 		L.setOptions(this, options);
 		this._arrow = L.polyline([], {color: 'darkblue', weight: 1});
 		this._map.on('zoomend', this._onAnnotationZoom, this);