loleaflet/src/layer/marker/Annotation.js | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit a75b780b8aa05d3cf5b8ede6f9075ca06a9d5d28
Author: Aron Budea <aron.bu...@collabora.com>
Date: Wed Aug 9 02:35:45 2017 +0200
loleaflet: don't add reply on Cancel, don't leave empty box
Reply was added when clicking Cancel. This is a regression from
07607863925cf4fc2dbc91685d8f430f849c5535
Additionally, when focus was lost on an empty, initial commit,
an empty, defunct comment box remained until reload.
Change-Id: I49a5224ff70de65623496cfcba538acb6a8086f8
Reviewed-on: https://gerrit.libreoffice.org/40915
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
diff --git a/loleaflet/src/layer/marker/Annotation.js
b/loleaflet/src/layer/marker/Annotation.js
index e60c4379..a569dc33 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -217,6 +217,7 @@ L.Annotation = L.Layer.extend({
_onCancelClick: function (e) {
L.DomEvent.stopPropagation(e);
this._nodeModifyText.value = this._contentText.origText;
+ this._nodeReplyText.value = '';
this.show();
this._map.fire('AnnotationCancel', {annotation: this});
},
@@ -233,6 +234,10 @@ L.Annotation = L.Layer.extend({
if (this._contentText.origText !== this._nodeModifyText.value) {
this._onSaveComment(e);
}
+ else if (this._nodeModifyText.value == '') {
+ // Implies that this._contentText.origText == ''
+ this._onCancelClick(e);
+ }
},
_onLostFocusReply: function(e) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
