Clean up code
Simplify event
This commit is contained in:
@@ -40,15 +40,15 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
|
||||
|
||||
feature --EVENT HANDLING
|
||||
|
||||
set_click_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]])
|
||||
set_click_event (e: attached like click_event)
|
||||
do
|
||||
click_event := e
|
||||
end
|
||||
|
||||
handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL)
|
||||
handle_callback (cname: STRING; event: STRING)
|
||||
do
|
||||
if Current.control_name.is_equal (cname) and attached click_event as cevent then
|
||||
cevent.call ([page])
|
||||
cevent.call ([])
|
||||
end
|
||||
end
|
||||
|
||||
@@ -68,6 +68,6 @@ feature
|
||||
|
||||
text: STRING
|
||||
|
||||
click_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]
|
||||
click_event: detachable PROCEDURE [ANY, TUPLE []]
|
||||
|
||||
end
|
||||
|
||||
@@ -38,7 +38,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
|
||||
|
||||
feature --EVENT HANDLING
|
||||
|
||||
handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL)
|
||||
handle_callback (cname: STRING; event: STRING)
|
||||
deferred
|
||||
end
|
||||
|
||||
|
||||
@@ -67,14 +67,14 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
|
||||
|
||||
feature --EVENT HANDLING
|
||||
|
||||
handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL)
|
||||
handle_callback (event: STRING; cname: STRING)
|
||||
do
|
||||
if equal (cname, control_name) then
|
||||
else
|
||||
across
|
||||
controls as c
|
||||
loop
|
||||
c.item.handle_callback (event, cname, page)
|
||||
c.item.handle_callback (event, cname)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -52,7 +52,7 @@ feature
|
||||
if attached {JSON_OBJECT} json_parser.parse_json as sp then
|
||||
control.load_state (sp)
|
||||
end
|
||||
control.handle_callback (control_name, event, Current)
|
||||
control.handle_callback (control_name, event)
|
||||
create new_states.make
|
||||
control.read_state (new_states)
|
||||
response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>)
|
||||
|
||||
@@ -41,16 +41,16 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
|
||||
feature --EVENT HANDLING
|
||||
|
||||
|
||||
set_change_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]])
|
||||
set_change_event (e: attached like change_event)
|
||||
do
|
||||
change_event := e
|
||||
end
|
||||
|
||||
handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL)
|
||||
handle_callback (cname: STRING; event: STRING)
|
||||
do
|
||||
if Current.control_name.is_equal (cname) and attached change_event as cevent then
|
||||
if event.is_equal ("change") then
|
||||
cevent.call ([page])
|
||||
cevent.call ([])
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -71,6 +71,6 @@ feature
|
||||
|
||||
text: STRING
|
||||
|
||||
change_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]
|
||||
change_event: detachable PROCEDURE [ANY, TUPLE []]
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user