Added WSF_WIDGET_RAW_TEXT to render text via html encoding.
Added WSF_WIDGET_COMPOSITE.extend_html_text (READABLE_STRING_8) that should replace the now obsolete "extend_text" Added WSF_WIDGET_COMPOSITE.extend_raw_text (READABLE_STRING_GENERAL), for text that need to be html encoded during html rendering. Made WSF_FORM_RAW_TEXT obsolete.
This commit is contained in:
@@ -32,7 +32,7 @@ feature {NONE} -- Initialization
|
|||||||
|
|
||||||
make_with_text (s: READABLE_STRING_8)
|
make_with_text (s: READABLE_STRING_8)
|
||||||
do
|
do
|
||||||
make_with_item (create {WSF_FORM_RAW_TEXT}.make (s))
|
make_with_item (create {WSF_WIDGET_TEXT}.make_with_text (s))
|
||||||
end
|
end
|
||||||
|
|
||||||
make_with_item (i: WSF_WIDGET)
|
make_with_item (i: WSF_WIDGET)
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
note
|
note
|
||||||
description: "Summary description for {WSF_FORM_RAW_TEXT}."
|
description: "Summary description for {WSF_FORM_RAW_TEXT}."
|
||||||
author: ""
|
|
||||||
date: "$Date$"
|
date: "$Date$"
|
||||||
revision: "$Revision$"
|
revision: "$Revision$"
|
||||||
|
|
||||||
class
|
class
|
||||||
WSF_FORM_RAW_TEXT
|
WSF_FORM_RAW_TEXT
|
||||||
|
|
||||||
|
obsolete "Use WSF_WIDGET_TEXT 2013-Sept-06"
|
||||||
|
|
||||||
inherit
|
inherit
|
||||||
WSF_WIDGET_TEXT
|
WSF_WIDGET_TEXT
|
||||||
rename
|
rename
|
||||||
|
|||||||
@@ -177,11 +177,24 @@ feature -- Change
|
|||||||
items.put_front (i)
|
items.put_front (i)
|
||||||
end
|
end
|
||||||
|
|
||||||
extend_text (t: READABLE_STRING_8)
|
extend_html_text (t: READABLE_STRING_8)
|
||||||
|
-- Extend a widget encapsulating html code `t'
|
||||||
do
|
do
|
||||||
extend (create {WSF_WIDGET_TEXT}.make_with_text (t))
|
extend (create {WSF_WIDGET_TEXT}.make_with_text (t))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
extend_text (t: READABLE_STRING_8)
|
||||||
|
obsolete "Use extend_html_text (..) 2013-Sept-06"
|
||||||
|
do
|
||||||
|
extend_html_text (t)
|
||||||
|
end
|
||||||
|
|
||||||
|
extend_raw_text (t: READABLE_STRING_GENERAL)
|
||||||
|
-- Extend a widget encapsulating html encoded text `t'
|
||||||
|
do
|
||||||
|
extend (create {WSF_WIDGET_RAW_TEXT}.make_with_text (t))
|
||||||
|
end
|
||||||
|
|
||||||
feature {NONE} -- Implementation: Items
|
feature {NONE} -- Implementation: Items
|
||||||
|
|
||||||
items_by_type_from (a_container: ITERABLE [WSF_WIDGET]; a_type: TYPE [detachable ANY]): detachable ARRAYED_LIST [WSF_WIDGET]
|
items_by_type_from (a_container: ITERABLE [WSF_WIDGET]; a_type: TYPE [detachable ANY]): detachable ARRAYED_LIST [WSF_WIDGET]
|
||||||
|
|||||||
41
library/server/wsf_html/widget/wsf_widget_raw_text.e
Normal file
41
library/server/wsf_html/widget/wsf_widget_raw_text.e
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
note
|
||||||
|
description: "Widget embedding raw text, this will be html encoded before being rendered in target html"
|
||||||
|
date: "$Date$"
|
||||||
|
revision: "$Revision$"
|
||||||
|
|
||||||
|
class
|
||||||
|
WSF_WIDGET_RAW_TEXT
|
||||||
|
|
||||||
|
inherit
|
||||||
|
WSF_WIDGET
|
||||||
|
|
||||||
|
create
|
||||||
|
make_with_text
|
||||||
|
|
||||||
|
feature {NONE} -- Initialization
|
||||||
|
|
||||||
|
make_with_text (a_text: READABLE_STRING_GENERAL)
|
||||||
|
do
|
||||||
|
text := a_text
|
||||||
|
end
|
||||||
|
|
||||||
|
feature -- Access
|
||||||
|
|
||||||
|
text: READABLE_STRING_GENERAL
|
||||||
|
-- Text to be html encoded into html
|
||||||
|
|
||||||
|
feature -- Change
|
||||||
|
|
||||||
|
set_text (a_text: like text)
|
||||||
|
do
|
||||||
|
text := a_text
|
||||||
|
end
|
||||||
|
|
||||||
|
feature -- Conversion
|
||||||
|
|
||||||
|
append_to_html (a_theme: WSF_THEME; a_html: STRING_8)
|
||||||
|
do
|
||||||
|
a_html.append (a_theme.html_encoded (text))
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
note
|
note
|
||||||
description: "Summary description for {WSF_WIDGET_TEXT}."
|
description: "Widget embedding html text/code, this will render as it is in target html"
|
||||||
author: ""
|
|
||||||
date: "$Date$"
|
date: "$Date$"
|
||||||
revision: "$Revision$"
|
revision: "$Revision$"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user