Commit d5498d25 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'dialog-fixes'

parents 5cfa3c53 fbc05787
...@@ -2596,16 +2596,16 @@ function gui_toggle_resize_cross(cid,tag,w,p1,p2,p3,p4,p5,p6,p7,p8,basex,basey) ...@@ -2596,16 +2596,16 @@ function gui_toggle_resize_cross(cid,tag,w,p1,p2,p3,p4,p5,p6,p7,p8,basex,basey)
var points1 = [p1 - basex, p2 - basey, var points1 = [p1 - basex, p2 - basey,
p3 - basex, p4 - basey p3 - basex, p4 - basey
].join(" "), ].join(" "),
points_array = [p5 - basex, p6 - basey, points2 = [p5 - basex, p6 - basey,
p7 - basex, p8 - basey p7 - basex, p8 - basey
].join(" "); ].join(" ");
gui(cid) gui(cid)
.get_elem(tag + "cross1", { .get_elem(tag + "cross1", {
points1: points, points: points1,
"stroke-width": w "stroke-width": w
}) })
.get_elem(tag + "cross2", { .get_elem(tag + "cross2", {
points2: points, points: points2,
"stroke-width": w "stroke-width": w
}); });
} }
...@@ -4402,7 +4402,7 @@ function gui_canvas_deleteredrect(cid) { ...@@ -4402,7 +4402,7 @@ function gui_canvas_deleteredrect(cid) {
// gui calls should really be minimized-- otherwise it's simply // gui calls should really be minimized-- otherwise it's simply
// too difficult to debug what's being passed over the socket. // too difficult to debug what's being passed over the socket.
gui(cid).get_gobj(cid, function(e) { gui(cid).get_gobj(cid, function(e) {
e.parentNode.removeChild(r); e.parentNode.removeChild(e);
}); });
} }
...@@ -4466,7 +4466,7 @@ function gui_cord_inspector_update(cid, text, basex, basey, bg_size, y1, y2, mov ...@@ -4466,7 +4466,7 @@ function gui_cord_inspector_update(cid, text, basex, basey, bg_size, y1, y2, mov
function gui_cord_inspector_erase(cid) { function gui_cord_inspector_erase(cid) {
gui(cid).get_gobj("cord_inspector", function(e) { gui(cid).get_gobj("cord_inspector", function(e) {
e.parentNode.removeChild(ci); e.parentNode.removeChild(e);
}); });
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment