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

Test the new controls

Browse Source
This commit is contained in:
YNH Webdev
2013-09-05 17:18:46 +02:00
parent edce18fb1f
commit 225f821206
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/server/wsf_html/webcontrol/wsf_control.e
View File

@@ -92,7 +92,7 @@ feature
css_classes_string := " class=%"" + css_classes_string + "%""
end
Result := "<" + tag_name + " data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attributes + css_classes_string
if body.is_empty then
if body.is_empty and not tag_name.is_equal("textarea") then
Result := Result + " />"
else
Result := Result + " >" + body + "</" + tag_name + ">"

18
library/server/wsf_html/webcontrol/wsf_form_element_control.e
View File

@@ -12,22 +12,21 @@ inherit
WSF_CONTROL
create
make_form_element,
make_form_element_with_validators
make_form_element, make_form_element_with_validators
feature {NONE}
make_form_element (a_label:STRING; c: WSF_VALUE_CONTROL [G])
make_form_element (a_label: STRING; c: WSF_VALUE_CONTROL [G])
local
a_validators: LINKED_LIST [WSF_VALIDATOR [G]]
do
create a_validators.make
make_form_element_with_validators(a_label,c,a_validators)
make_form_element_with_validators (a_label, c, a_validators)
end
make_form_element_with_validators (a_label: STRING; c: WSF_VALUE_CONTROL [G]; v: LINKED_LIST [WSF_VALIDATOR [G]])
do
make (c.control_name+"_container", "div")
make (c.control_name + "_container", "div")
add_class ("form-group")
c.add_class ("form-control")
value_control := c
@@ -64,6 +63,15 @@ feature --Implementation
value_control.handle_callback (cname, event)
end
read_state_changes (states: JSON_OBJECT)
-- Add a new entry in the `states_changes` JSON object with the `control_name` as key and the `state` as value
do
if state_changes.count > 0 then
states.put (state_changes, create {JSON_STRING}.make_json (control_name))
end
value_control.read_state_changes (states)
end
render: STRING
local
body: STRING

3
library/server/wsf_html/webcontrol/wsf_page_control.e
View File

@@ -77,6 +77,8 @@ feature
create states.make
control.read_state (states)
data := "<html><head>"
data.append ("<link href=%"//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css%" rel=%"stylesheet%">")
data.append ("</head><body>")
data.append (control.render)
data.append ("<script type=%"text/javascript%">window.states=")
@@ -84,7 +86,6 @@ feature
data.append (";</script>")
data.append ("<script src=%"//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js%"></script>")
data.append ("<script src=%"/widget.js%"></script>")
data.append ("<link href=%"//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css%" rel=%"stylesheet%">")
data.append ("</body></html>")
create page.make
page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>)