# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2017-03-04 17:42:41
# Node ID 3ff4ab7515ae0f98034cfd5c8dd34c786847be45
# Parent  2272bd987ca0aa46b9131dd6c68f658cc9efc963

Allow resetting form manually

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index 2d8be2b9dc365561480d87bd701b5efce51d6dd8..75579780556b4ff36ce965df03838a1a83c48534
GIT binary patch
literal 11499
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

diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
--- a/boards/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -483,8 +483,8 @@ msgid "to message "
 msgstr "на сообщение"
 
 #: templates/boards/thread_normal.html:59
-msgid "Close form"
-msgstr "Закрыть форму"
+msgid "Reset form"
+msgstr "Сбросить форму"
 
 #: templates/search/search.html:17
 msgid "Ok"
diff --git a/boards/static/css/base.css b/boards/static/css/base.css
--- a/boards/static/css/base.css
+++ b/boards/static/css/base.css
@@ -93,10 +93,6 @@ textarea, input {
     cursor: pointer;
 }
 
-#form-close-button {
-    display: none;
-}
-
 .post-image-full {
     width: 100%;
     height: auto;
diff --git a/boards/static/js/thread.js b/boards/static/js/thread.js
--- a/boards/static/js/thread.js
+++ b/boards/static/js/thread.js
@@ -23,7 +23,6 @@
  for the JavaScript code in this page.
  */
 
-var CLOSE_BUTTON = '#form-close-button';
 var REPLY_TO_MSG = '.reply-to-message';
 var REPLY_TO_MSG_ID = '#reply-to-message-id';
 
@@ -38,11 +37,23 @@ function getForm() {
     return $('.post-form-w');
 }
 
-function resetFormPosition() {
+/**
+ * Clear all entered values in the form fields
+ */
+function resetForm() {
     var form = getForm();
+
+    form.find('input:text, input:password, input:file, select, textarea').val('');
+    form.find('input:radio, input:checkbox').removeAttr('checked').removeAttr('selected');
+    $('.file_wrap').find('.file-thumb').remove();
+    $('#preview-text').hide();
+
+    resetFormPosition(form);
+}
+
+function resetFormPosition(form) {
     form.insertAfter($('.thread'));
 
-    $(CLOSE_BUTTON).hide();
     $(REPLY_TO_MSG).hide();
 }
 
@@ -50,7 +61,6 @@ function showFormAfter(blockToInsertAfte
     var form = getForm();
     form.insertAfter(blockToInsertAfter);
 
-    $(CLOSE_BUTTON).show();
     form.show();
     $(REPLY_TO_MSG_ID).text(blockToInsertAfter.attr('id'));
     $(REPLY_TO_MSG).show();
diff --git a/boards/static/js/thread_update.js b/boards/static/js/thread_update.js
--- a/boards/static/js/thread_update.js
+++ b/boards/static/js/thread_update.js
@@ -264,16 +264,6 @@ function showNewPostsTitle(newPostCount)
     }
 }
 
-/**
- * Clear all entered values in the form fields
- */
-function resetForm(form) {
-    form.find('input:text, input:password, input:file, select, textarea').val('');
-    form.find('input:radio, input:checkbox')
-             .removeAttr('checked').removeAttr('selected');
-    $('.file_wrap').find('.file-thumb').remove();
-    $('#preview-text').hide();
-}
 
 /**
  * When the form is posted, this method will be run as a callback
@@ -286,8 +276,7 @@ function updateOnPost(response, statusTe
     $('.post-form-w').unblock();
 
     if (status === 'ok') {
-        resetFormPosition();
-        resetForm(form);
+        resetForm();
         getThreadDiff();
         scrollToBottom();
     } else {
@@ -393,7 +382,7 @@ function updateNodeAttr(oldNode, newNode
 
             form.ajaxForm(options);
 
-            resetForm(form);
+            resetForm();
         }
     }
 });
diff --git a/boards/templates/boards/thread_normal.html b/boards/templates/boards/thread_normal.html
--- a/boards/templates/boards/thread_normal.html
+++ b/boards/templates/boards/thread_normal.html
@@ -66,7 +66,7 @@
                 </div>
                 <div><a href="{% url "staticpage" name="help" %}">
                     {% trans 'Text syntax' %}</a></div>
-                <div><a id="form-close-button" href="#" onClick="resetFormPosition(); return false;">{% trans 'Close form' %}</a></div>
+                <div><a href="#" onClick="resetForm(); return false;">{% trans 'Reset form' %}</a></div>
             </div>
         </div>