From 89d1649f66641db42e9d3db881aca8877a6cd4e5 Mon Sep 17 00:00:00 2001 From: totoro Date: Sat, 20 Aug 2022 11:04:35 +0900 Subject: [PATCH] merge conflict resolved --- web/widgets/fisheye_menu.anubis | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/widgets/fisheye_menu.anubis b/web/widgets/fisheye_menu.anubis index dfbc7c7..8f10b11 100644 --- a/web/widgets/fisheye_menu.anubis +++ b/web/widgets/fisheye_menu.anubis @@ -10,12 +10,13 @@ transmit tools/basis.anubis transmit xlib/web/making_a_web_site.anubis read xlib/web/jQuery/jq_animate.anubis read xlib/web/jquery.anubis +read xlib/web/web_action.anubis public type FisheyeEntry: fisheye_entry( String id, //html id String icon_path, //path of the icon to shown with this entry - String action, //action to do when click on that icon + WEB_Action_Name action, //action (url to apply when click on that icon String help_text //Help text to show ). @@ -35,7 +36,7 @@ define List(HTML_Off_Form) [ id(h.id), class("menu_item"+if h.id = selected_space then " menu_selected" else ""), - event(onclick,"location.href='?a="+h.action+"';"), + event(onclick,"location.href='"+format_web_action_name(h.action)+"';"), attr("widgetid",h.id), attr("title",_T(h.help_text)) ], -- libgit2 0.21.4