Completed a previous commit, especially to web form library (WSF_FORM).
Updated EiffelStudio wizard.
This commit is contained in:
@@ -109,6 +109,7 @@ feature -- Conversion
|
||||
local
|
||||
l_is_already_selected: BOOLEAN
|
||||
h: detachable STRING_8
|
||||
l_item_html_text: READABLE_STRING_8
|
||||
do
|
||||
a_html.append ("<select name=%""+ name +"%" ")
|
||||
if css_id = Void then
|
||||
@@ -128,7 +129,7 @@ feature -- Conversion
|
||||
across
|
||||
options as o
|
||||
loop
|
||||
a_html.append ("<option value=%"" + o.item.value + "%" ")
|
||||
a_html.append ("<option value=%"" + html_encoded_string (o.item.value) + "%" ")
|
||||
-- if not l_is_already_selected then
|
||||
if
|
||||
o.item.is_selected
|
||||
@@ -137,12 +138,13 @@ feature -- Conversion
|
||||
a_html.append (" selected=%"selected%"")
|
||||
end
|
||||
-- end
|
||||
a_html.append (">" + o.item.text + "</option>%N")
|
||||
l_item_html_text := html_encoded_string (o.item.text)
|
||||
a_html.append (">" + l_item_html_text + "</option>%N")
|
||||
if attached o.item.description as d then
|
||||
if h = Void then
|
||||
create h.make_empty
|
||||
end
|
||||
h.append ("<div id=%"" + name + "-" + o.item.value + "%" class=%"option%"><strong>"+ o.item.text +"</strong>:"+ d + "</div>")
|
||||
h.append ("<div id=%"" + name + "-" + html_encoded_string (o.item.value) + "%" class=%"option%"><strong>"+ l_item_html_text +"</strong>:"+ d + "</div>")
|
||||
end
|
||||
end
|
||||
a_html.append ("</select>%N")
|
||||
|
||||
@@ -17,14 +17,14 @@ create
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (a_value: READABLE_STRING_GENERAL; a_text: detachable like text)
|
||||
make (a_value: READABLE_STRING_GENERAL; a_text: detachable READABLE_STRING_GENERAL)
|
||||
-- Initialize `Current'.
|
||||
do
|
||||
value := a_value.as_string_32
|
||||
if a_text = Void then
|
||||
text := html_encoder.general_encoded_string (a_value)
|
||||
else
|
||||
text := a_text
|
||||
text := a_text.to_string_32
|
||||
end
|
||||
end
|
||||
|
||||
@@ -37,16 +37,16 @@ feature -- Status
|
||||
Result := value.same_string_general (v)
|
||||
end
|
||||
|
||||
is_same_text (v: like text): BOOLEAN
|
||||
is_same_text (v: READABLE_STRING_GENERAL): BOOLEAN
|
||||
do
|
||||
Result := text.same_string (v)
|
||||
Result := v.same_string (text)
|
||||
end
|
||||
|
||||
feature -- Access
|
||||
|
||||
value: READABLE_STRING_32
|
||||
|
||||
text: READABLE_STRING_8
|
||||
text: READABLE_STRING_32
|
||||
|
||||
description: detachable READABLE_STRING_8
|
||||
|
||||
|
||||
Reference in New Issue
Block a user