From 2de03383f638e6d3b79cce29d94192a1ecc947fd Mon Sep 17 00:00:00 2001
From: Bartek Fabiszewski <github@fabiszewski.net>
Date: Sun, 16 Feb 2020 19:24:23 +0100
Subject: [PATCH] Verify comment is not null

---
 js/src/positiondialogmodel.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/js/src/positiondialogmodel.js b/js/src/positiondialogmodel.js
index 8fcd7c6..a3d8d45 100644
--- a/js/src/positiondialogmodel.js
+++ b/js/src/positiondialogmodel.js
@@ -63,7 +63,7 @@ export default class PositionDialogModel extends ViewModel {
       <div style="clear: both; padding-bottom: 1em;"></div>
       <form id="positionForm">
         <label><b>${$._('comment')}</b></label><br>
-        <textarea style="width:100%;" maxlength="255" rows="5" placeholder="${$._('comment')}" name="comment" data-bind="comment">${uUtils.htmlEncode(this.position.comment)}</textarea>
+        <textarea style="width:100%;" maxlength="255" rows="5" placeholder="${$._('comment')}" name="comment" data-bind="comment">${this.position.hasComment() ? uUtils.htmlEncode(this.position.comment) : ''}</textarea>
         <div class="buttons">
           <button class="button-reject" data-bind="onCancel" type="button">${$._('cancel')}</button>
           <button class="button-resolve" data-bind="onPositionUpdate" type="submit">${$._('submit')}</button>
@@ -106,9 +106,6 @@ export default class PositionDialogModel extends ViewModel {
    * @return {boolean} True if valid
    */
   validate() {
-    if (this.model.comment === this.position.comment) {
-      return false;
-    }
-    return true;
+    return this.model.comment !== this.position.comment;
   }
 }