n0rdye/puzzle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

object image cache fix

Browse Source
This commit is contained in:
N0rdye 2023-10-06 02:53:06 +05:00
parent bc4de6510a
commit 6d2d93a1bf
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/lib/fn.js
View File

@ -353,7 +353,7 @@ async function removeImageBackground(image) {
// } // }
} }
list.push(img); list.push(img);
img.src = array[i]; img.src = `${array[i]}?${new Date().getTime()}`;
if(i==array.length-1){ if(i==array.length-1){
callback(); callback();
} }

4
views/admin/objects/object_creation.ejs
View File

@ -43,10 +43,9 @@
<input type="checkbox" id="obj_color_check" onchange="color_warning()"> <input type="checkbox" id="obj_color_check" onchange="color_warning()">
<label for="obj_color_check">возможность менять цвет</label> <label for="obj_color_check">возможность менять цвет</label>
<script> <script>
old_prev = document.getElementById("img_prev");
function color_warning(){ function color_warning(){
let color_check = document.getElementById("obj_color_check"); let color_check = document.getElementById("obj_color_check");
let old_prev = document.getElementById("img_prev").src; let old_prev = document.getElementById("img_prev").getAttribute("img_static");
if(color_check.checked == true){ if(color_check.checked == true){
obj_colors_load(); obj_colors_load();
removeImageBackground(document.getElementById("img_prev").src).then((out)=>{ removeImageBackground(document.getElementById("img_prev").src).then((out)=>{
@ -166,6 +165,7 @@
name_div.value = name; name_div.value = name;
img_file.value = null; img_file.value = null;
img_prev.src = img; img_prev.src = img;
img_prev.setAttribute("img_static",img);
img_prev.style.height = `${height* cm_mult}px`; img_prev.style.height = `${height* cm_mult}px`;
img_prev.style.width = `${width* cm_mult}px`; img_prev.style.width = `${width* cm_mult}px`;
cost_text.value = cost; cost_text.value = cost;

13
views/admin/objects/object_edit.ejs
View File

@ -129,7 +129,7 @@
name : document.getElementById("nobj_name").value, name : document.getElementById("nobj_name").value,
height : document.getElementById("obj_height").value, height : document.getElementById("obj_height").value,
width : document.getElementById("obj_width").value, width : document.getElementById("obj_width").value,
img : document.getElementById('img_prev').src, img : document.getElementById('img_prev').getAttribute("src"),
cost : document.getElementById("obj_cost").value, cost : document.getElementById("obj_cost").value,
colors : String(document.getElementById("obj_color_check").checked) colors : String(document.getElementById("obj_color_check").checked)
} }
@ -157,7 +157,8 @@
changes[element] = cur_atts[element]; changes[element] = cur_atts[element];
} }
else if (element == "img" && cur_atts[element] != menu.getAttribute(`src`)){ else if (element == "img" && cur_atts[element] != menu.getAttribute(`src`)){
changes[element] = cur_atts[element]; let tmp = getBase64Image(cur_atts[element]);
changes[element] = tmp;
} }
else if ((element != "name" && element != "img") && cur_atts[element] != menu.getAttribute(`${element}`)){ else if ((element != "name" && element != "img") && cur_atts[element] != menu.getAttribute(`${element}`)){
changes[element] = cur_atts[element]; changes[element] = cur_atts[element];
@ -177,10 +178,8 @@
} }
else{ else{
msg("товар сохранён"); msg("товар сохранён");
setTimeout(()=>{ set_obj_edit_params();
edit_get_objs(); edit_get_objs();
set_obj_edit_params();
},1500)
} }
} }
}); });
@ -243,7 +242,7 @@
obj.classList.add("object"); obj.classList.add("object");
obj.setAttribute("name",value["name"].split("~")[0].replaceAll("$"," ")) obj.setAttribute("name",value["name"].split("~")[0].replaceAll("$"," "))
obj.setAttribute("src",img) obj.setAttribute("src",`${img}?${new Date().getTime()}`)
obj.setAttribute("height",value["height"]) obj.setAttribute("height",value["height"])
obj.setAttribute("width",value["width"]) obj.setAttribute("width",value["width"])
obj.setAttribute("obj_id",value["id"]) obj.setAttribute("obj_id",value["id"])