Change STRING TO STRING_32
This commit is contained in:
@@ -25,13 +25,13 @@ create
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (t: STRING)
|
||||
make (t: STRING_32)
|
||||
-- Initialize
|
||||
do
|
||||
make_with_body_class (t, "", "", "")
|
||||
end
|
||||
|
||||
make_with_body (t, attr, b: STRING)
|
||||
make_with_body (t, attr, b: STRING_32)
|
||||
-- Initialize with specific attributes and body
|
||||
do
|
||||
make_stateless_control (t)
|
||||
@@ -39,7 +39,7 @@ feature {NONE} -- Initialization
|
||||
body := b
|
||||
end
|
||||
|
||||
make_with_body_class (t, attr, c, b: STRING)
|
||||
make_with_body_class (t, attr, c, b: STRING_32)
|
||||
-- Initialize with specific class, attributes and body
|
||||
do
|
||||
make_with_body (t, attr, b)
|
||||
@@ -50,7 +50,7 @@ feature {NONE} -- Initialization
|
||||
|
||||
feature -- Rendering
|
||||
|
||||
render: STRING
|
||||
render: STRING_32
|
||||
-- HTML representation of this control
|
||||
do
|
||||
Result := render_tag (body, attributes)
|
||||
@@ -58,7 +58,7 @@ feature -- Rendering
|
||||
|
||||
feature -- Change
|
||||
|
||||
set_body (b: STRING)
|
||||
set_body (b: STRING_32)
|
||||
-- Set the body of this control
|
||||
do
|
||||
body := b
|
||||
@@ -66,10 +66,10 @@ feature -- Change
|
||||
|
||||
feature -- Access
|
||||
|
||||
attributes: STRING
|
||||
attributes: STRING_32
|
||||
-- Attributes of this control
|
||||
|
||||
body: STRING
|
||||
body: STRING_32
|
||||
-- Body of this control
|
||||
|
||||
end
|
||||
|
||||
@@ -22,7 +22,7 @@ create
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (a_text: STRING)
|
||||
make (a_text: STRING_32)
|
||||
-- Initialize with specified control name and text
|
||||
do
|
||||
make_control ("button")
|
||||
@@ -58,7 +58,7 @@ feature --Event handling
|
||||
click_event := e
|
||||
end
|
||||
|
||||
handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY)
|
||||
handle_callback (cname: LIST [STRING_32]; event: STRING_32; event_parameter: detachable ANY)
|
||||
do
|
||||
if Current.control_name.same_string (cname [1]) and attached click_event as cevent then
|
||||
cevent.call (Void)
|
||||
@@ -67,10 +67,10 @@ feature --Event handling
|
||||
|
||||
feature -- Rendering
|
||||
|
||||
render: STRING
|
||||
render: STRING_32
|
||||
-- HTML representation of this control
|
||||
local
|
||||
attr: STRING
|
||||
attr: STRING_32
|
||||
do
|
||||
create attr.make_empty
|
||||
if attached attributes as a then
|
||||
@@ -84,7 +84,7 @@ feature -- Rendering
|
||||
|
||||
feature -- Change
|
||||
|
||||
set_text (t: STRING)
|
||||
set_text (t: STRING_32)
|
||||
-- Set text of that button
|
||||
do
|
||||
if not t.same_string (text) then
|
||||
@@ -106,7 +106,7 @@ feature -- Properties
|
||||
disabled: BOOLEAN
|
||||
-- Defines if the button is editable
|
||||
|
||||
text: STRING
|
||||
text: STRING_32
|
||||
-- The text currently displayed on this button
|
||||
|
||||
click_event: detachable PROCEDURE [ANY, TUPLE]
|
||||
|
||||
@@ -21,7 +21,7 @@ inherit
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (a_tag_name: STRING)
|
||||
make (a_tag_name: STRING_32)
|
||||
-- Initialize with specified and tag
|
||||
require
|
||||
not a_tag_name.is_empty
|
||||
@@ -36,7 +36,7 @@ feature {NONE} -- Initialization
|
||||
|
||||
feature -- Actions
|
||||
|
||||
start_modal (url: STRING; title: STRING; big: BOOLEAN)
|
||||
start_modal (url: STRING_32; title: STRING_32; big: BOOLEAN)
|
||||
--Start a modal window containg an other or the same page
|
||||
local
|
||||
modal: WSF_JSON_OBJECT
|
||||
@@ -52,7 +52,7 @@ feature -- Actions
|
||||
actions.add (modal)
|
||||
end
|
||||
|
||||
show_alert (message: STRING)
|
||||
show_alert (message: STRING_32)
|
||||
--Start a modal window containg an other or the same page
|
||||
local
|
||||
alert: WSF_JSON_OBJECT
|
||||
@@ -63,7 +63,7 @@ feature -- Actions
|
||||
actions.add (alert)
|
||||
end
|
||||
|
||||
redirect (url: STRING)
|
||||
redirect (url: STRING_32)
|
||||
--Redirect to an other page
|
||||
local
|
||||
modal: WSF_JSON_OBJECT
|
||||
@@ -127,17 +127,17 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
|
||||
|
||||
feature -- Rendering
|
||||
|
||||
render_tag (body: STRING; attrs: detachable STRING): STRING
|
||||
render_tag (body: STRING_32; attrs: detachable STRING_32): STRING_32
|
||||
-- Render this control with the specified body and attributes
|
||||
do
|
||||
Result := render_tag_with_generator_name (js_class, body, attrs)
|
||||
end
|
||||
|
||||
render_tag_with_generator_name (a_generator, body: STRING; attrs: detachable STRING): STRING
|
||||
render_tag_with_generator_name (a_generator, body: STRING_32; attrs: detachable STRING_32): STRING_32
|
||||
-- Render this control with the specified generator name, body and attributes
|
||||
local
|
||||
css_classes_string: STRING
|
||||
l_attributes: STRING
|
||||
css_classes_string: STRING_32
|
||||
l_attributes: STRING_32
|
||||
do
|
||||
css_classes_string := ""
|
||||
across
|
||||
@@ -155,14 +155,14 @@ feature -- Rendering
|
||||
Result := render_tag_with_tagname (tag_name, body, l_attributes, css_classes_string)
|
||||
end
|
||||
|
||||
js_class: STRING
|
||||
js_class: STRING_32
|
||||
do
|
||||
Result := generator
|
||||
end
|
||||
|
||||
feature -- Event handling
|
||||
|
||||
handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY)
|
||||
handle_callback (cname: LIST [STRING_32]; event: STRING_32; event_parameter: detachable ANY)
|
||||
-- Method called if any callback received. In this method you can route the callback to the event handler
|
||||
deferred
|
||||
end
|
||||
@@ -187,14 +187,14 @@ feature -- Properties
|
||||
control_id := d
|
||||
end
|
||||
|
||||
control_name: STRING
|
||||
control_name: STRING_32
|
||||
do
|
||||
Result := control_name_prefix + control_id.out
|
||||
end
|
||||
|
||||
control_name_prefix: STRING assign set_control_name_prefix
|
||||
control_name_prefix: STRING_32 assign set_control_name_prefix
|
||||
|
||||
set_control_name_prefix (p: STRING)
|
||||
set_control_name_prefix (p: STRING_32)
|
||||
do
|
||||
control_name_prefix := p
|
||||
end
|
||||
|
||||
@@ -22,7 +22,7 @@ inherit
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make_with_tag_name (tag: STRING)
|
||||
make_with_tag_name (tag: STRING_32)
|
||||
do
|
||||
Precursor (tag)
|
||||
create items.make_array
|
||||
@@ -113,11 +113,11 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
|
||||
|
||||
feature
|
||||
|
||||
create_control_from_tag (tag: STRING): detachable G
|
||||
create_control_from_tag (tag: STRING_32): detachable G
|
||||
deferred
|
||||
end
|
||||
|
||||
add_control_from_tag (tag: STRING)
|
||||
add_control_from_tag (tag: STRING_32)
|
||||
local
|
||||
item: WSF_JSON_OBJECT
|
||||
do
|
||||
@@ -153,7 +153,7 @@ feature
|
||||
end
|
||||
end
|
||||
|
||||
js_class: STRING
|
||||
js_class: STRING_32
|
||||
do
|
||||
Result := "WSF_DYNAMIC_MULTI_CONTROL"
|
||||
end
|
||||
|
||||
@@ -29,19 +29,19 @@ create
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make_without_border (a_label: detachable STRING; c: WSF_VALUE_CONTROL [G])
|
||||
make_without_border (a_label: detachable STRING_32; c: WSF_VALUE_CONTROL [G])
|
||||
-- Initialize form element control with a specific label (or 'Void' for no label) and value control
|
||||
do
|
||||
make_with_validators (a_label, False, c, create {ARRAYED_LIST [WSF_VALIDATOR [G]]}.make (0))
|
||||
end
|
||||
|
||||
make (a_label: detachable STRING; c: WSF_VALUE_CONTROL [G])
|
||||
make (a_label: detachable STRING_32; c: WSF_VALUE_CONTROL [G])
|
||||
-- Initialize form element control with a specific label (or 'Void' for no label) and value control
|
||||
do
|
||||
make_with_validators (a_label, True, c, create {ARRAYED_LIST [WSF_VALIDATOR [G]]}.make (0))
|
||||
end
|
||||
|
||||
make_with_validators (a_label: detachable STRING; show_border: BOOLEAN; c: WSF_VALUE_CONTROL [G]; v: LIST [WSF_VALIDATOR [G]])
|
||||
make_with_validators (a_label: detachable STRING_32; show_border: BOOLEAN; c: WSF_VALUE_CONTROL [G]; v: LIST [WSF_VALIDATOR [G]])
|
||||
-- Initialize form element control with a specific label (or 'Void' for no label), value control and list of validators
|
||||
do
|
||||
make_control ("div")
|
||||
@@ -145,7 +145,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
|
||||
|
||||
feature -- Event handling
|
||||
|
||||
handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY)
|
||||
handle_callback (cname: LIST [STRING_32]; event: STRING_32; event_parameter: detachable ANY)
|
||||
-- Pass callback to subcontrols
|
||||
do
|
||||
if cname [1].same_string (control_name) then
|
||||
@@ -163,10 +163,10 @@ feature -- Event handling
|
||||
|
||||
feature -- Implementation
|
||||
|
||||
render: STRING
|
||||
render: STRING_32
|
||||
-- HTML Respresentation of this form element control
|
||||
local
|
||||
body: STRING
|
||||
body: STRING_32
|
||||
do
|
||||
body := ""
|
||||
if attached label as l and then not l.is_empty then
|
||||
@@ -188,7 +188,7 @@ feature -- Validation
|
||||
validators.extend (v)
|
||||
end
|
||||
|
||||
set_error (e: STRING)
|
||||
set_error (e: STRING_32)
|
||||
-- Set the error message that will be displayed upon failure of client side validation
|
||||
do
|
||||
error := e
|
||||
@@ -228,10 +228,10 @@ feature -- Properties
|
||||
validators: LIST [WSF_VALIDATOR [G]]
|
||||
-- The validators which check the input when validaton is performed
|
||||
|
||||
label: detachable STRING
|
||||
label: detachable STRING_32
|
||||
-- The label of this form element control
|
||||
|
||||
error: STRING
|
||||
error: STRING_32
|
||||
-- The error message that is displayed when client side validation fails
|
||||
|
||||
label_width: INTEGER
|
||||
|
||||
@@ -13,7 +13,7 @@ class
|
||||
|
||||
inherit
|
||||
|
||||
WSF_VALUE_CONTROL [STRING]
|
||||
WSF_VALUE_CONTROL [STRING_32]
|
||||
rename
|
||||
make as make_value_control
|
||||
end
|
||||
@@ -23,7 +23,7 @@ create
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (t, v: STRING)
|
||||
make (t, v: STRING_32)
|
||||
-- Initialize
|
||||
do
|
||||
make_value_control (t)
|
||||
@@ -49,19 +49,19 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
|
||||
|
||||
feature --Event handling
|
||||
|
||||
handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY)
|
||||
handle_callback (cname: LIST [STRING_32]; event: STRING_32; event_parameter: detachable ANY)
|
||||
do
|
||||
end
|
||||
|
||||
feature -- Implementation
|
||||
|
||||
render: STRING
|
||||
render: STRING_32
|
||||
-- HTML representation of this html control
|
||||
do
|
||||
Result := render_tag (html, "")
|
||||
end
|
||||
|
||||
set_html (t: STRING)
|
||||
set_html (t: STRING_32)
|
||||
do
|
||||
if not t.same_string (html) then
|
||||
html := t
|
||||
@@ -69,18 +69,18 @@ feature -- Implementation
|
||||
end
|
||||
end
|
||||
|
||||
value: STRING
|
||||
value: STRING_32
|
||||
do
|
||||
Result := html
|
||||
end
|
||||
|
||||
set_value (v: STRING)
|
||||
set_value (v: STRING_32)
|
||||
do
|
||||
html := v
|
||||
end
|
||||
|
||||
feature -- Properties
|
||||
|
||||
html: STRING
|
||||
html: STRING_32
|
||||
|
||||
end
|
||||
|
||||
@@ -23,7 +23,7 @@ create
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (n: STRING)
|
||||
make (n: STRING_32)
|
||||
do
|
||||
make_with_tag_name ("div")
|
||||
add_class ("row")
|
||||
|
||||
@@ -32,7 +32,7 @@ feature {NONE} -- Initialization
|
||||
make_with_tag_name ("div")
|
||||
end
|
||||
|
||||
make_with_tag_name (t: STRING)
|
||||
make_with_tag_name (t: STRING_32)
|
||||
-- Initialize with specified control name and tag
|
||||
do
|
||||
make_control (t)
|
||||
@@ -135,7 +135,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
|
||||
|
||||
feature -- Event handling
|
||||
|
||||
handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY)
|
||||
handle_callback (cname: LIST [STRING_32]; event: STRING_32; event_parameter: detachable ANY)
|
||||
-- Pass callback to subcontrols
|
||||
do
|
||||
if equal (cname [1], control_name) then
|
||||
@@ -157,7 +157,7 @@ feature -- Event handling
|
||||
|
||||
feature -- Rendering
|
||||
|
||||
render: STRING
|
||||
render: STRING_32
|
||||
-- HTML representation of this multi control
|
||||
do
|
||||
Result := ""
|
||||
|
||||
@@ -62,10 +62,10 @@ feature -- Implementation
|
||||
-- Entry Point: If request is a callback, restore control states and execute handle then return new state json.
|
||||
-- If request is not a callback. Run process and render the html page
|
||||
local
|
||||
event: detachable STRING
|
||||
event: detachable STRING_32
|
||||
event_parameter: detachable ANY
|
||||
event_control_name: detachable STRING
|
||||
states: STRING
|
||||
event_control_name: detachable STRING_32
|
||||
states: STRING_32
|
||||
states_changes: WSF_JSON_OBJECT
|
||||
json_parser: JSON_PARSER
|
||||
do
|
||||
@@ -111,7 +111,7 @@ feature -- Implementation
|
||||
response.send (page)
|
||||
end
|
||||
|
||||
render: STRING
|
||||
render: STRING_32
|
||||
local
|
||||
ajax: BOOLEAN
|
||||
do
|
||||
@@ -146,7 +146,7 @@ feature -- Implementation
|
||||
control.read_state_changes (states)
|
||||
end
|
||||
|
||||
get_parameter (key: STRING): detachable STRING
|
||||
get_parameter (key: STRING_32): detachable STRING_32
|
||||
-- Read query parameter as string
|
||||
local
|
||||
value: detachable WSF_VALUE
|
||||
@@ -160,7 +160,7 @@ feature -- Implementation
|
||||
|
||||
feature -- Event handling
|
||||
|
||||
handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY)
|
||||
handle_callback (cname: LIST [STRING_32]; event: STRING_32; event_parameter: detachable ANY)
|
||||
-- Forward callback to control
|
||||
do
|
||||
control.handle_callback (cname, event, event_parameter)
|
||||
@@ -196,7 +196,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
|
||||
|
||||
feature
|
||||
|
||||
control_name: STRING
|
||||
control_name: STRING_32
|
||||
|
||||
feature {NONE} -- Root control
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ deferred class
|
||||
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (a_tag_name: STRING)
|
||||
make (a_tag_name: STRING_32)
|
||||
-- Initialize with specified tag
|
||||
require
|
||||
not a_tag_name.is_empty
|
||||
@@ -25,30 +25,30 @@ feature {NONE} -- Initialization
|
||||
|
||||
feature -- Access
|
||||
|
||||
tag_name: STRING
|
||||
tag_name: STRING_32
|
||||
-- The tag name
|
||||
|
||||
css_classes: ARRAYED_LIST [STRING]
|
||||
css_classes: ARRAYED_LIST [STRING_32]
|
||||
-- List of classes (appear in the "class" attribute)
|
||||
|
||||
attributes: detachable STRING
|
||||
attributes: detachable STRING_32
|
||||
-- Attributes string (without classes)
|
||||
|
||||
feature -- Change
|
||||
|
||||
add_class (c: STRING)
|
||||
add_class (c: STRING_32)
|
||||
-- Add a css class to this control
|
||||
do
|
||||
css_classes.force (c)
|
||||
end
|
||||
|
||||
remove_class (cla: STRING)
|
||||
remove_class (cla: STRING_32)
|
||||
-- Add a css class to this control
|
||||
do
|
||||
css_classes.prune (cla)
|
||||
end
|
||||
|
||||
append_attribute (a: STRING)
|
||||
append_attribute (a: STRING_32)
|
||||
-- Adds the specified attribute to the attribute string of this control
|
||||
do
|
||||
if attached attributes as attr then
|
||||
@@ -61,10 +61,10 @@ feature -- Change
|
||||
|
||||
feature -- Rendering
|
||||
|
||||
render_tag (body: STRING; attrs: detachable STRING): STRING
|
||||
render_tag (body: STRING_32; attrs: detachable STRING_32): STRING_32
|
||||
-- Generate HTML of this control with the specified body and attributes
|
||||
local
|
||||
css_classes_string: STRING
|
||||
css_classes_string: STRING_32
|
||||
do
|
||||
create css_classes_string.make_empty
|
||||
across
|
||||
@@ -75,10 +75,10 @@ feature -- Rendering
|
||||
Result := render_tag_with_tagname (tag_name, body, attrs, css_classes_string)
|
||||
end
|
||||
|
||||
render_tag_with_tagname (tag, body: STRING; attrs: detachable STRING; css_classes_string: STRING): STRING
|
||||
render_tag_with_tagname (tag, body: STRING_32; attrs: detachable STRING_32; css_classes_string: STRING_32): STRING_32
|
||||
-- Generate HTML of the specified tag with specified body, attributes and css classes
|
||||
local
|
||||
l_attributes: STRING
|
||||
l_attributes: STRING_32
|
||||
do
|
||||
if attached attrs as a then
|
||||
create l_attributes.make_from_string (a)
|
||||
@@ -99,13 +99,13 @@ feature -- Rendering
|
||||
end
|
||||
end
|
||||
|
||||
render_tag_with_body (body: STRING): STRING
|
||||
render_tag_with_body (body: STRING_32): STRING_32
|
||||
-- Generate HTML of this control with the specified body
|
||||
do
|
||||
Result := render_tag (body, attributes)
|
||||
end
|
||||
|
||||
render: STRING
|
||||
render: STRING_32
|
||||
-- Return html representation of control
|
||||
deferred
|
||||
end
|
||||
|
||||
@@ -40,7 +40,7 @@ feature
|
||||
set_subcontrol_prefixes
|
||||
end
|
||||
|
||||
set_control_name_prefix (p: STRING)
|
||||
set_control_name_prefix (p: STRING_32)
|
||||
do
|
||||
control_name_prefix := p
|
||||
set_subcontrol_prefixes
|
||||
@@ -69,10 +69,10 @@ feature
|
||||
end
|
||||
end
|
||||
|
||||
render_tag (body: STRING; attrs: detachable STRING): STRING
|
||||
render_tag (body: STRING_32; attrs: detachable STRING_32): STRING_32
|
||||
-- Generate HTML of this control with the specified body and attributes
|
||||
local
|
||||
css_classes_string: STRING
|
||||
css_classes_string: STRING_32
|
||||
do
|
||||
create css_classes_string.make_empty
|
||||
across
|
||||
@@ -85,7 +85,7 @@ feature
|
||||
|
||||
feature -- Event handling
|
||||
|
||||
handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY)
|
||||
handle_callback (cname: LIST [STRING_32]; event: STRING_32; event_parameter: detachable ANY)
|
||||
-- Pass callback to subcontrols
|
||||
do
|
||||
across
|
||||
|
||||
Reference in New Issue
Block a user