backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restructure callbacks

Browse Source
This commit is contained in:
YNH Webdev
2013-09-22 18:30:48 +02:00
parent f360e8a867
commit 3a9ede6e8c
10 changed files with 2023 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widgetapp/application.e
View File

@@ -135,7 +135,7 @@ feature -- Execution
local
f: WSF_FILE_RESPONSE
do
create f.make_html (name)
create f.make (name)
response.send (f)
end

8
examples/widgetapp/base_page.e
View File

@@ -20,10 +20,10 @@ feature
create container.make_multi_control ("container")
container.add_class ("container")
create navbar.make_navbar ("Sample Page")
navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/%"", "Home"))
navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/grid%"", "Grid"))
navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/repeater%"", "Repeater"))
navbar.add_element_right (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"#%"", "About"))
navbar.nav.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/%"", "Home"))
navbar.nav.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/grid%"", "Grid"))
navbar.nav.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/repeater%"", "Repeater"))
navbar.nav_right.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"#%"", "About"))
container.add_control (navbar)
control := container
end

1143
examples/widgetapp/typeahead.min.js vendored
View File

File diff suppressed because one or more lines are too long

205
examples/widgetapp/widget.coffee
View File

@@ -1,3 +1,4 @@
#IMPORTANT PLEASE COMPILE WITH:: coffee -cbw widget.coffee
cache = {}
template = tmpl = (str, data) ->
# Simple JavaScript Templating
@@ -10,20 +11,20 @@ Mini =
{
render:template(t)
}
trigger_callback = (control_name,event,event_parameter)->
$.ajax
data:
control_name: control_name
event: event
event_parameter: event_parameter
states: JSON.stringify(window.states)
cache: no
.done (new_states)->
#Update all classes
for name,state of new_states
controls[name]?.update(state)
return
build_control = (control_name, state, control)->
$el = control.$el.find('[data-name='+control_name+']')
#get control type
type = $el.data('type')
#create class
typeclass = null
try
typeclass = eval(type)
catch e
typeclass = WSF_CONTROL
if type? and typeclass?
return new typeclass(control, $el, control_name, state)
return null
class WSF_VALIDATOR
constructor: (@parent_control, @settings)->
@@ -55,21 +56,71 @@ class WSF_MAX_VALIDATOR extends WSF_VALIDATOR
val = @parent_control.value()
return (val.length<=@settings.max)
validatormap =
"WSF_REGEXP_VALIDATOR":WSF_REGEXP_VALIDATOR
"WSF_MIN_VALIDATOR":WSF_MIN_VALIDATOR
"WSF_MAX_VALIDATOR":WSF_MAX_VALIDATOR
class WSF_CONTROL
constructor: (@control_name, @$el)->
constructor: (@parent_control, @$el, @control_name, @fullstate)->
@state = @fullstate.state
@load_subcontrols()
return
load_subcontrols: ()->
if @fullstate.controls?
@controls=(build_control(control_name, state, @) for control_name, state of @fullstate.controls)
else
@controls = []
attach_events: ()->
console.log "Attached #{@control_name}"
for control in @controls
if control?
control.attach_events()
return
update: (state)->
return
get_state: ()->
@state
get_control_states:()->
result = {}
for control in @controls
if control?
result[control.control_name]=control.get_full_state()
result
get_full_state: ()->
{"state":@get_state(),"controls":@get_control_states()}
process_update: (new_states)->
if new_states[@control_name]?
@update(new_states[@control_name])
for control in @controls
if control?
control.process_update(new_states)
get_context_state : ()->
if @parent_control?
return @parent_control.get_context_state()
return @get_full_state()
trigger_callback: (control_name,event,event_parameter)->
if @parent_control?
return @parent_control.trigger_callback(control_name,event,event_parameter)
self = @
$.ajax
type: 'POST',
url: '?' + $.param
control_name: control_name
event: event
data:
JSON.stringify(@get_full_state())
processData: false,
contentType: 'application/json',
cache: no
.done (new_states)->
#Update all classes
self.process_update(new_states)
#Simple event listener
#subscribe to an event
@@ -89,36 +140,45 @@ class WSF_CONTROL
ev.callback.call(ev.context)
return @
class WSF_PAGE_CONTROL extends WSF_CONTROL
constructor: (@fullstate)->
@state = @fullstate.state
@parent_control=null
@$el = $('[data-name='+@state.id+']')
@control_name = @state.id
@load_subcontrols()
controls = {}
class WSF_BUTTON_CONTROL extends WSF_CONTROL
attach_events: ()->
super
self = @
@$el.click (e)->
e.preventDefault()
self.click()
click: ()->
if window.states[@control_name]['callback_click']
trigger_callback(@control_name, 'click')
if @state['callback_click']
@trigger_callback(@control_name, 'click')
update: (state) ->
if state.text?
window.states[@control_name]['text'] = state.text
@state['text'] = state.text
@$el.text(state.text)
class WSF_INPUT_CONTROL extends WSF_CONTROL
attach_events: ()->
super
self = @
@$el.change ()->
self.change()
change: ()->
#update local state
window.states[@control_name]['text'] = @$el.val()
if window.states[@control_name]['callback_change']
trigger_callback(@control_name, 'change')
@state['text'] = @$el.val()
if @state['callback_change']
@trigger_callback(@control_name, 'change')
@trigger('change')
value:()->
@@ -126,28 +186,31 @@ class WSF_INPUT_CONTROL extends WSF_CONTROL
update: (state) ->
if state.text?
window.states[@control_name]['text'] = state.text
@state['text'] = state.text
@$el.val(state.text)
class WSF_TEXTAREA_CONTROL extends WSF_INPUT_CONTROL
class WSF_AUTOCOMPLETE_CONTROL extends WSF_INPUT_CONTROL
attach_events: () ->
super
self = @
@$el.typeahead({
name: @control_name
template: window.states[@control_name]['template']
template: @state['template']
engine: Mini
remote:
url:""
replace: (url, uriEncodedQuery) ->
window.states[self.control_name]['text'] = self.$el.val()
self.state['text'] = self.$el.val()
'?' + $.param
control_name: self.control_name
event: 'autocomplete'
states: JSON.stringify(window.states)
states: JSON.stringify(self.get_context_state())
filter: (parsedResponse) ->
parsedResponse[self.control_name]['suggestions']
fn: ()->
self.trigger_callback(self.control_name, 'autocomplete')
})
@$el.on 'typeahead:closed',()->
self.change()
@@ -156,16 +219,17 @@ class WSF_AUTOCOMPLETE_CONTROL extends WSF_INPUT_CONTROL
class WSF_CHECKBOX_CONTROL extends WSF_CONTROL
attach_events: ()->
super
self = @
@checked_value = window.states[@control_name]['checked_value']
@checked_value = @state['checked_value']
@$el.change ()->
self.change()
change: ()->
#update local state
window.states[@control_name]['checked'] = @$el.is(':checked')
if window.states[@control_name]['callback_change']
trigger_callback(@control_name, 'change')
@state['checked'] = @$el.is(':checked')
if @state['callback_change']
@trigger_callback(@control_name, 'change')
@trigger('change')
value:()->
@@ -173,23 +237,25 @@ class WSF_CHECKBOX_CONTROL extends WSF_CONTROL
update: (state) ->
if state.text?
window.states[@control_name]['checked'] = state.checked
@state['checked'] = state.checked
@$el.prop('checked',state.checked)
class WSF_FORM_ELEMENT_CONTROL extends WSF_CONTROL
attach_events: ()->
super
self = @
@value_control = controls[window.states[@control_name]['value_control']]
@value_control = @controls[0]
if @value_control?
#subscribe to change event on value_control
@value_control.on('change',@change,@)
@serverside_validator = false
#Initialize validators
@validators = []
for validator in window.states[@control_name]['validators']
if validatormap[validator.name]?
@validators.push new validatormap[validator.name](@,validator)
else
for validator in @state['validators']
try
validatorclass = eval(validator.name)
@validators.push new validatorclass(@,validator)
catch e
#Use serverside validator if no js implementation
@serverside_validator = true
return
@@ -203,7 +269,7 @@ class WSF_FORM_ELEMENT_CONTROL extends WSF_CONTROL
@showerror("")
#If there is validator which is not implemented in js ask server to validate
if @serverside_validator
trigger_callback(@control_name, 'validate')
@trigger_callback(@control_name, 'validate')
return
showerror: (message)->
@@ -228,19 +294,16 @@ class WSF_HTML_CONTROL extends WSF_CONTROL
update: (state) ->
if state.html?
window.states[@control_name]['html'] = state.html
@state['html'] = state.html
@$el.html(state.html)
class WSF_CHECKBOX_LIST_CONTROL extends WSF_CONTROL
attach_events: ()->
self = @
@subcontrols = []
super
#Listen to events of subelements and forward them
for name,control of controls
if @$el.has(control.$el).length > 0
@subcontrols.push(control)
control.on('change',@change,@)
for control in @controls
control.on('change',@change,@)
return
change:()->
@@ -248,7 +311,7 @@ class WSF_CHECKBOX_LIST_CONTROL extends WSF_CONTROL
value:()->
result = []
for subc in @subcontrols
for subc in @controls
if subc.value()
result.push(subc.checked_value)
return result
@@ -256,20 +319,22 @@ class WSF_CHECKBOX_LIST_CONTROL extends WSF_CONTROL
class WSF_PROGRESS_CONTROL extends WSF_CONTROL
attach_events:() ->
super
self = @
runfetch= ()->
self.fetch()
setInterval(runfetch, 5000)
fetch: ()->
trigger_callback(@control_name, 'progress_fetch')
@trigger_callback(@control_name, 'progress_fetch')
update: (state)->
if state.progress?
window.states[@control_name]['progress'] = state.progress
@state['progress'] = state.progress
@$el.children('.progress-bar').attr('aria-valuenow', state.progress).width(state.progress + '%')
class WSF_PAGINATION_CONTROL extends WSF_CONTROL
attach_events: ()->
self = @
@$el.on 'click', 'a', (e)->
@@ -279,11 +344,11 @@ class WSF_PAGINATION_CONTROL extends WSF_CONTROL
click: (e)->
nr = $(e.target).data('nr')
if nr == "next"
trigger_callback(@control_name, "next")
@trigger_callback(@control_name, "next")
else if nr == "prev"
trigger_callback(@control_name, "prev")
@trigger_callback(@control_name, "prev")
else
trigger_callback(@control_name, "goto", nr)
@trigger_callback(@control_name, "goto", nr)
update: (state) ->
if state._html?
@@ -291,49 +356,25 @@ class WSF_PAGINATION_CONTROL extends WSF_CONTROL
class WSF_GRID_CONTROL extends WSF_CONTROL
attach_events: ()->
super
self = @
update: (state) ->
if state.datasource?
window.states[@control_name]['datasource'] = state.datasource
@state['datasource'] = state.datasource
if state._body?
@$el.find('tbody').html(state._body)
class WSF_REPEATER_CONTROL extends WSF_CONTROL
attach_events: ()->
super
self = @
update: (state) ->
if state.datasource?
window.states[@control_name]['datasource'] = state.datasource
@state['datasource'] = state.datasource
if state._body?
@$el.find('.repeater_content').html(state._body)
console.log state._body
#map class name to effective class
typemap =
"WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL
"WSF_INPUT_CONTROL": WSF_INPUT_CONTROL
"WSF_TEXTAREA_CONTROL": WSF_TEXTAREA_CONTROL
"WSF_AUTOCOMPLETE_CONTROL": WSF_AUTOCOMPLETE_CONTROL
"WSF_CHECKBOX_CONTROL": WSF_CHECKBOX_CONTROL
"WSF_FORM_ELEMENT_CONTROL": WSF_FORM_ELEMENT_CONTROL
"WSF_HTML_CONTROL": WSF_HTML_CONTROL
"WSF_CHECKBOX_LIST_CONTROL": WSF_CHECKBOX_LIST_CONTROL
"WSF_PROGRESS_CONTROL": WSF_PROGRESS_CONTROL
"WSF_PAGINATION_CONTROL": WSF_PAGINATION_CONTROL
"WSF_GRID_CONTROL": WSF_GRID_CONTROL
"WSF_REPEATER_CONTROL":WSF_REPEATER_CONTROL
#create a js class for each control
for name,state of window.states
#find control DOM element
$el = $('[data-name='+name+']')
#get control type
type = $el.data('type')
#create class
if type? and typemap[type]?
controls[name]=new typemap[type](name,$el)
for name,state of window.states
controls[name]?.attach_events()

1280
examples/widgetapp/widget.js
View File

File diff suppressed because it is too large Load Diff

2
library/server/wsf_js_widget/input/wsf_checkbox_list_control.e
View File

@@ -12,7 +12,7 @@ inherit
WSF_VALUE_CONTROL [LIST [STRING]]
undefine
load_state,
read_state,
full_state,
read_state_changes
end

11
library/server/wsf_js_widget/webcontrol/wsf_control.e
View File

@@ -35,7 +35,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
load_state (new_states: JSON_OBJECT)
-- Select state stored with `control_name` as key
do
if attached {JSON_OBJECT} new_states.item (control_name) as new_state_obj then
if attached {JSON_OBJECT} new_states.item ("state") as new_state_obj then
set_state (new_state_obj)
end
end
@@ -45,10 +45,11 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
deferred
end
read_state (states: JSON_OBJECT)
-- Add a new entry in the `states` JSON object with the `control_name` as key and the `state` as value
full_state: JSON_OBJECT
-- Return state of object
do
states.put (state, control_name)
create Result.make
Result.put (state, "state")
end
read_state_changes (states: JSON_OBJECT)
@@ -62,6 +63,8 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
state: JSON_OBJECT
-- Returns the current state of the Control as JSON. This state will be transfered to the client.
deferred
ensure
controls_not_defined: not (attached Result.item ("controls"))
end
state_changes: JSON_OBJECT

17
library/server/wsf_js_widget/webcontrol/wsf_form_element_control.e
View File

@@ -13,7 +13,7 @@ inherit
redefine
read_state_changes,
load_state,
read_state
full_state
end
WSF_VALIDATABLE
@@ -52,7 +52,9 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
-- Pass new_states to subcontrols
do
Precursor (new_states)
value_control.load_state (new_states)
if attached {JSON_OBJECT} new_states.item ("controls") as ct and then attached {JSON_OBJECT} ct.item (value_control.control_name) as value_state then
value_control.load_state (value_state)
end
end
set_state (new_state: JSON_OBJECT)
@@ -61,11 +63,14 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
value_control.set_state (new_state)
end
read_state (states: JSON_OBJECT)
-- Read states in subcontrols
full_state: JSON_OBJECT
local
controls_state: JSON_OBJECT
do
Precursor (states)
value_control.read_state (states)
Result := Precursor
create controls_state.make
controls_state.put (value_control.full_state, value_control.control_name)
Result.put (controls_state, "controls")
end
read_state_changes (states: JSON_OBJECT)

28
library/server/wsf_js_widget/webcontrol/wsf_multi_control.e
View File

@@ -11,7 +11,7 @@ inherit
WSF_CONTROL
redefine
read_state,
full_state,
read_state_changes,
load_state
end
@@ -31,7 +31,7 @@ feature {NONE} -- Initialization
-- Initialize with specified control name and tag
do
make_control (n, t)
controls := create {ARRAYED_LIST [G]}.make(5);
controls := create {ARRAYED_LIST [G]}.make (5);
end
feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
@@ -40,11 +40,15 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
-- Pass new_states to subcontrols
do
Precursor (new_states)
across
controls as c
loop
if attached {WSF_CONTROL} c.item as cont then
cont.load_state (new_states)
if attached {JSON_OBJECT} new_states.item ("controls") as ct then
across
controls as c
loop
if attached {WSF_CONTROL} c.item as cont then
if attached {JSON_OBJECT} ct.item (cont.control_name) as value_state then
cont.load_state (value_state)
end
end
end
end
end
@@ -54,17 +58,21 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
do
end
read_state (states: JSON_OBJECT)
full_state: JSON_OBJECT
-- Read states in subcontrols
local
controls_state: JSON_OBJECT
do
Precursor (states)
Result := Precursor
create controls_state.make
across
controls as c
loop
if attached {WSF_CONTROL} c.item as cont then
cont.read_state (states)
controls_state.put (cont.full_state, cont.control_name)
end
end
Result.put (controls_state, "controls")
end
read_state_changes (states: JSON_OBJECT)

49
library/server/wsf_js_widget/webcontrol/wsf_page_control.e
View File

@@ -47,21 +47,24 @@ feature -- Implementation
local
event: detachable STRING
event_parameter: detachable STRING
control_name: detachable STRING
states: detachable STRING
event_control_name: detachable STRING
states: STRING
states_changes: JSON_OBJECT
json_parser: JSON_PARSER
do
control_name := get_parameter ("control_name")
event_control_name := get_parameter ("control_name")
event := get_parameter ("event")
event_parameter := get_parameter ("event_parameter")
states := get_parameter ("states")
if attached event and attached control_name and attached control and attached states then
if attached event and attached event_control_name and attached control then
create states.make_empty
request.read_input_data_into (states)
create json_parser.make_parser (states)
if attached {JSON_OBJECT} json_parser.parse_json as sp then
control.load_state (sp)
if attached {JSON_OBJECT} sp.item ("controls") as ct and then attached {JSON_OBJECT} ct.item (control.control_name) as value_state then
control.load_state (value_state)
end
end
control.handle_callback (control_name, event, event_parameter)
control.handle_callback (event_control_name, event, event_parameter)
create states_changes.make
control.read_state_changes (states_changes)
response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json; charset=ISO-8859-1"]>>)
@@ -82,16 +85,14 @@ feature -- Implementation
data := "<html><head>"
data.append ("<link href=%"/bootstrap.min.css%" rel=%"stylesheet%">")
data.append ("<link href=%"/widget.css%" rel=%"stylesheet%">")
data.append ("</head><body>")
data.append ("</head><body data-name=%"" + control_name + "%" data-type=%"WSF_PAGE_CONTROL%">")
data.append (control.render)
data.append ("<script type=%"text/javascript%">window.states=")
create states.make
control.read_state (states)
data.append (states.representation)
data.append (";</script>")
data.append ("<script src=%"/jquery.min.js%"></script>")
data.append ("<script src=%"/typeahead.min.js%"></script>")
data.append ("<script src=%"/widget.js%"></script>")
data.append ("<script type=%"text/javascript%">$(function() {var page= new WSF_PAGE_CONTROL(")
data.append (full_state.representation)
data.append (");page.attach_events();});</script>")
data.append ("</body></html>")
create page.make
page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html; charset=ISO-8859-1"]>>)
@@ -99,6 +100,28 @@ feature -- Implementation
response.send (page)
end
control_name: STRING
do
Result := request.request_time_stamp.out
end
state: JSON_OBJECT
do
create Result.make
Result.put (create {JSON_STRING}.make_json (control_name), "id")
end
full_state: JSON_OBJECT
local
controls_state: JSON_OBJECT
do
create Result.make
create controls_state.make
controls_state.put (control.full_state, control.control_name)
Result.put (controls_state, "controls")
Result.put (state, "state")
end
get_parameter (key: STRING): detachable STRING
-- Read query parameter as string
local