From 5564936a35ecd63c718b875bf654d59d5cd67cfa Mon Sep 17 00:00:00 2001
From: n0rdye <dev@n0r.su>
Date: Fri, 27 Oct 2023 12:24:13 +0000
Subject: [PATCH] 	modified:   public/lib/fn.js 	modified:  
 public/lib/inter.js 	modified:   views/admin/objects/object_edit.ejs 
 modified:   views/project.ejs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    fix:
    Не обновляет данные при внесении изменений. сам объект в редакторе обновляется, но в панели остаются первые данные.
    Выделение объекта не должно сохранятся при скачивании.
---
 public/lib/fn.js                    | 40 ++++++++++++++---------------
 public/lib/inter.js                 | 27 +++++++++----------
 views/admin/objects/object_edit.ejs |  1 +
 views/project.ejs                   |  1 +
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/public/lib/fn.js b/public/lib/fn.js
index b96c2f2..ba33e28 100644
--- a/public/lib/fn.js
+++ b/public/lib/fn.js
@@ -361,26 +361,26 @@ async function removeImageBackground(image) {
         }
     }
 
-    // $.post( "/get_objs")
-    // .done(function( res ) {
-    //     if(res["out"] == "good"){
-    //         // console.log(res["body"]);
-    //         let sources = [];
-    //         res["body"].forEach(element => {
-    //             sources.push(element["img"]);
-    //             if(element == res["body"].at(-1)){
-    //                 // console.log(sources);
-    //                 preloadImages(sources,()=>{
-    //                     // console.log("cached");
-    //                     callback();
-    //                     // sources.forEach(element => {
-    //                     //     console.log(element,is_cached(element));
-    //                     // });
-    //                 })
-    //             }
-    //         });
-    //     }
-    // });
+    $.post( "/get_objs")
+    .done(function( res ) {
+        if(res["out"] == "good"){
+            // console.log(res["body"]);
+            let sources = [];
+            res["body"].forEach(element => {
+                sources.push(element["img"]);
+                if(element == res["body"].at(-1)){
+                    // console.log(sources);
+                    preloadImages(sources,()=>{
+                        // console.log("cached");
+                        callback();
+                        // sources.forEach(element => {
+                        //     console.log(element,is_cached(element));
+                        // });
+                    })
+                }
+            });
+        }
+    });
 
     function is_cached(img_url){
         var imgEle = document.createElement("img");
diff --git a/public/lib/inter.js b/public/lib/inter.js
index 98f31cc..3e69ca6 100644
--- a/public/lib/inter.js
+++ b/public/lib/inter.js
@@ -108,19 +108,20 @@ function obj_click(id){
         obj_selection();
         // console.log(obj.);
     }
-    function obj_selection(){
-        let drags = document.getElementsByClassName("drag");
-        Object.values(drags).forEach(element => {
-            // console.log(element.id,cur_obj);
-            if (element.id != cur_obj){
-                element.style.border = "0px";
-            }
-            else{
-                element.style.border = "2px black solid"; 
-                element.style.borderRadius = "0.2vw"; 
-            }
-        });
-    }
+}
+function obj_selection(clear = false){
+    cur_obj = (clear == true)? null:cur_obj;
+    let drags = document.getElementsByClassName("drag");
+    Object.values(drags).forEach(element => {
+        // console.log(element.id,cur_obj);
+        if (element.id != cur_obj){
+            element.style.border = "0px";
+        }
+        else{
+            element.style.border = "2px black solid"; 
+            element.style.borderRadius = "0.2vw"; 
+        }
+    });
 }
 
 function resize_drags(){
diff --git a/views/admin/objects/object_edit.ejs b/views/admin/objects/object_edit.ejs
index 7dc800c..9b54f54 100644
--- a/views/admin/objects/object_edit.ejs
+++ b/views/admin/objects/object_edit.ejs
@@ -186,6 +186,7 @@
                         else{
                             msg("товар сохранён");
                             set_obj_edit_params();
+                            edit_get_objs();
                         }
                     }
                 });
diff --git a/views/project.ejs b/views/project.ejs
index 32867a5..0356078 100644
--- a/views/project.ejs
+++ b/views/project.ejs
@@ -331,6 +331,7 @@
     }
 
     function proj_img(callback,cost = false){
+        obj_selection(true)
         let width = (parseInt(document.getElementById("wall").style.width))
         document.getElementById("drags").append(document.getElementById("wall"));
         document.getElementById("drags").style.height = document.getElementById("wall").style.height;