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

[Pranav Kant]

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

New commits:
commit d88496d2a4cb6123be5b8ad7ddf0c9a4a1f2a3db
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
    (cherry picked from commit d5cdd776cf21487fbf213fde5b1c3dfc745b8f96)
    Reviewed-on: https://gerrit.libreoffice.org/37022
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 253b698b..af6503b1 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -265,7 +265,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});
 	},