From 22f5b687c49198d8746333679ed6c1f88752d9c8 Mon Sep 17 00:00:00 2001 From: eskyuu Date: Mon, 4 Mar 2024 19:33:16 +0800 Subject: [PATCH] Custommap label fixes (#15875) * Fixes for the edge label: - Hide when editing the default settings - Copy the correct value into the textbox when editing * Show the re-render button when a label is cleared --- resources/views/map/custom-edit.blade.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/views/map/custom-edit.blade.php b/resources/views/map/custom-edit.blade.php index 4ac1a74833..843c121913 100644 --- a/resources/views/map/custom-edit.blade.php +++ b/resources/views/map/custom-edit.blade.php @@ -253,7 +253,7 @@ var mid_x = mid_pos.x; var mid_y = mid_pos.y; - var mid = {id: edgeid + "_mid", shape: "dot", size: 3, x: mid_x, y: mid_y}; + var mid = {id: edgeid + "_mid", shape: "dot", size: 3, x: mid_x, y: mid_y, label: ''}; var edge1 = structuredClone(newedgeconf); edge1.id = edgeid + "_from"; @@ -854,6 +854,7 @@ $("#edgePortReverseRow").hide(); $("#edgePortSearchRow").hide(); $("#edgeRecenterRow").hide(); + $("#edgelabel").hide(); $("#edgestyle").val(newedgeconf.smooth.type); $("#edgetextface").val(newedgeconf.font.face); @@ -923,10 +924,12 @@ $("#edgetextcolour").val(edgedata.edge1.font.color); $("#edgetextshow").bootstrapSwitch('state', (edgedata.edge1.label != null && edgedata.edge1.label.includes('xx%'))); $("#edgebpsshow").bootstrapSwitch('state', (edgedata.edge1.label != null && edgedata.edge1.label.includes('bps'))); + $("#edgelabel").val('label' in edgedata.mid ? edgedata.mid.label : ''); $("#edgeRecenterRow").show(); $("#divEdgeFrom").show(); $("#divEdgeTo").show(); + $("#edgelabel").show(); $("#edge-saveButton").show(); $("#edge-saveDefaultsButton").hide(); $("#edge-saveButton").on("click", {data: edgedata}, callback); @@ -949,7 +952,11 @@ edgedata.edge1.font.color = edgedata.edge2.font.color = $("#edgetextcolour").val(); edgedata.edge1.label = edgedata.edge2.label = edgeLabel($("#edgetextshow").prop('checked'), $("#edgebpsshow").prop('checked'), null); edgedata.edge1.title = edgedata.edge2.title = $("#port_id").val(); - edgedata.mid.label = ($("#edgelabel").val() || ''); + let newlabel = $("#edgelabel").val() || ''; + if (newlabel == '' && edgedata.mid.label != '') { + $("#map-renderButton").show(); + } + edgedata.mid.label = newlabel; if(edgedata.id) { if($("#port_id").val()) {