From 7f43458cdaebe362ca216ef6adfea34bf1894f41 Mon Sep 17 00:00:00 2001
From: Maxim Leshchenko <cnmaks90@gmail.com>
Date: Thu, 2 Dec 2021 14:01:48 +0200
Subject: [PATCH] Wall: Fix attachment of files in the comment popup

---
 Web/Presenters/templates/components/textArea.xml | 14 ++++++++++----
 Web/static/js/al_wall.js                         | 15 +++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
index af7d20dc..3228b919 100644
--- a/Web/Presenters/templates/components/textArea.xml
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -49,20 +49,20 @@
             <br/>
             <input type="submit" value="{_'write'}" class="button" />
             <div style="float: right; display: flex; flex-direction: column;">
-                <a href="javascript:void(u('#wallAttachmentMenu').toggleClass('hidden'));">
+                <a href="javascript:void(u('#post-buttons{$textAreaId} #wallAttachmentMenu').toggleClass('hidden'));">
                     Прикрепить
                 </a>
                 
                 <div id="wallAttachmentMenu" class="hidden">
-                    <a href="javascript:void(document.querySelector('input[name=_pic_attachment]').click());">
+                    <a href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_pic_attachment]').click());">
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/mimetypes/application-x-egon.png" />
                         {_attach_photo}
                     </a>
-                    <a href="javascript:void(document.querySelector('input[name=_vid_attachment]').click());">
+                    <a href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_vid_attachment]').click());">
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/mimetypes/application-vnd.rn-realmedia.png" />
                         Прикрепить видео
                     </a>
-                    <a n:if="$graffiti ?? false" href="javascript:initGraffiti();">
+                    <a n:if="$graffiti ?? false" href="javascript:initGraffiti({$textAreaId});">
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/actions/draw-brush.png" />
                         Нарисовать граффити
                     </a>
@@ -72,6 +72,12 @@
     </form>
 </div>
 
+<script>
+    $(document).ready(() => u("#post-buttons{$textAreaId} .postFileSel").on("change", function() {
+        handleUpload.bind(this, {$textAreaId})();
+    }));
+</script>
+
 {if $graffiti}
     {script "js/node_modules/react/dist/react-with-addons.min.js"}
     {script "js/node_modules/react-dom/dist/react-dom.min.js"}
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index aa66974c..f850dfdb 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -22,12 +22,13 @@ function trim(string) {
     return newStr;
 }
 
-function handleUpload() {
+function handleUpload(id) {
     console.warn("блять...");
     
-    u(".postFileSel").not("#" + this.id).each(input => input.value = null);
+    document.querySelector("input[name='_poll_attachment']").value = "";
+    u(".postFileSel" + id).not("#" + this.id).each(input => input.value = null);
     
-    var indicator = u(".post-upload");
+    var indicator = u("#post-buttons" + id + " .post-upload");
     var file      = this.files[0];
     if(typeof file === "undefined") {
         indicator.attr("style", "display: none;");
@@ -37,7 +38,7 @@ function handleUpload() {
     }
 }
 
-function initGraffiti() {
+function initGraffiti(id) {
     let canvas = null;
     let msgbox = MessageBox("Нарисовать граффити", "<div id='ovkDraw'></div>", ["Сохранить", "Отменить"], [function() {
         canvas.getImage({includeWatermark: false}).toBlob(blob => {
@@ -46,11 +47,11 @@ function initGraffiti() {
             let trans = new DataTransfer();
             trans.items.add(image);
             
-            let fileSelect = document.querySelector("input[name='_pic_attachment']");
+            let fileSelect = document.querySelector("#post-buttons" + id + " input[name='_pic_attachment']");
             fileSelect.files = trans.files;
             
             u(fileSelect).trigger("change");
-            u("#write textarea").trigger("focusin");
+            u("#post-buttons" + id + " #write textarea").trigger("focusin");
         }, "image/jpeg", 0.92);
         
         canvas.teardown();
@@ -113,5 +114,3 @@ u("#wall-post-input").on("input", function(e) {
     // revert to original size if it is larger (possibly changed by user)
     // textArea.style.height = (newHeight > originalHeight ? (newHeight + boost) : originalHeight) + "px";
 });
-
-u(".postFileSel").on("change", handleUpload);