strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loleaflet: don't add reply on Cancel, don't leave empty box

Browse source 
Reply was added when clicking Cancel. This is a regression from
0760786392

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 <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
This commit is contained in:
Aron Budea 2017-08-09 02:35:45 +02:00 committed by pranavk
parent 894c5f2cc2
commit a75b780b8a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
loleaflet/src/layer/marker/Annotation.js
View file

@ -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) {