From 8bccab7bc08839e102b73b171cbe7ff79ddd6169 Mon Sep 17 00:00:00 2001
From: lalka2016 <99399973+lalka2016@users.noreply.github.com>
Date: Fri, 11 Aug 2023 12:37:25 +0300
Subject: [PATCH] Newlines and fix textareas

---
 .../templates/components/paginators/new.xml       |  2 +-
 Web/Presenters/templates/components/textArea.xml  |  2 +-
 Web/static/css/main.css                           | 15 +--------------
 Web/static/js/al_mentions.js                      |  2 +-
 Web/static/js/al_wall.js                          | 10 ++++++++++
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Web/Presenters/templates/components/paginators/new.xml b/Web/Presenters/templates/components/paginators/new.xml
index 38102752..d108897e 100644
--- a/Web/Presenters/templates/components/paginators/new.xml
+++ b/Web/Presenters/templates/components/paginators/new.xml
@@ -2,4 +2,4 @@
 
 <div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage) && $conf->page < $pageCount" class="showMore" data-pageсount="{$pageCount}" data-page="{$conf->page}">
     {_show_more}
-</div>
\ No newline at end of file
+</div>
diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
index f76649d6..8cd4cbf5 100644
--- a/Web/Presenters/templates/components/textArea.xml
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -3,7 +3,7 @@
 
 <div id="write" style="padding: 5px 0;" onfocusin="expand_wall_textarea({$textAreaId});">
     <form action="{$route}" method="post" enctype="multipart/form-data" style="margin:0;">
-        <textarea id="wall-post-input{$textAreaId}" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="small-textarea"></textarea>
+        <textarea id="wall-post-input{$textAreaId}" data-id="{$textAreaId}" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="small-textarea"></textarea>
         <div>
             <!-- padding to fix <br/> bug -->
         </div>
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index cedfaa90..3ab144ad 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -2697,22 +2697,9 @@ body.article .floating_sidebar, body.article .page_content {
     font-size: 12px;
 }
 
-.small_red_button {
-    float: right;
-    font-weight: bold;
-}
-
-.small_red_button a {
-    color: #B0B0B0;
-}
-
-.small_red_button a:hover {
-    color: #a7a7a7;
-}
-
 .showMore {
     text-align: center;
     padding-top: 10px;
     padding-bottom: 10px;
     cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/Web/static/js/al_mentions.js b/Web/static/js/al_mentions.js
index 4deb139e..1fe419de 100644
--- a/Web/static/js/al_mentions.js
+++ b/Web/static/js/al_mentions.js
@@ -44,4 +44,4 @@ tippy(".mention", {
 });
 }
 
-initMentions()
\ No newline at end of file
+initMentions()
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 15cc244b..2999b5e1 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -305,6 +305,16 @@ $(document).on("click", ".showMore", async (e) => {
         for(const obj of objects) {
             container.insertAdjacentHTML("beforeend", obj.outerHTML)
         }
+        
+        if(result.querySelectorAll("textarea").length > 0) {
+            for(const trea of result.querySelectorAll("textarea")) {
+                setupWallPostInputHandlers(trea.dataset.id)
+
+                u("#post-buttons" + trea.dataset.id + " .postFileSel").on("change", function() {
+                    handleUpload.bind(this, trea.dataset.id)();
+                });
+            }
+        }
 
         bsdnHydrate()