From 27c77721fd0e907815cd092f3b24a1e8afc2e7b8 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 1 Dec 2016 20:41:03 +0100 Subject: [PATCH] Fixed a few void-safety issue, attribute not initialized before computing agent objects. --- .../wsf_js_widget/examples/demo/grid_page.e | 7 ++++--- .../examples/demo/repeater_page.e | 8 +++++--- .../wsf_js_widget/examples/demo/sample_page.e | 18 +++++++++++++----- .../wsf_js_widget/examples/demo/slider_page.e | 3 ++- .../wsf_js_widget/examples/demo/upload_page.e | 19 +++++++++++-------- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/draft/library/server/wsf_js_widget/examples/demo/grid_page.e b/draft/library/server/wsf_js_widget/examples/demo/grid_page.e index 09119d67..6de5fdfb 100644 --- a/draft/library/server/wsf_js_widget/examples/demo/grid_page.e +++ b/draft/library/server/wsf_js_widget/examples/demo/grid_page.e @@ -20,15 +20,16 @@ feature initialize_controls do - Precursor - control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", "Grid Demo")) create datasource.make_news create search_query.make (create {GOOGLE_AUTOCOMPLETION}.make) search_query.add_class ("form-control") + create grid.make (<>, datasource) + + Precursor + control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", "Grid Demo")) search_query.set_change_event (agent change_query) control.add_control (search_query) control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h2", "", "Results")) - create grid.make (<>, datasource) control.add_control (grid) navbar.set_active (2) end diff --git a/draft/library/server/wsf_js_widget/examples/demo/repeater_page.e b/draft/library/server/wsf_js_widget/examples/demo/repeater_page.e index 02e88c36..f3e20fe4 100644 --- a/draft/library/server/wsf_js_widget/examples/demo/repeater_page.e +++ b/draft/library/server/wsf_js_widget/examples/demo/repeater_page.e @@ -20,15 +20,17 @@ feature initialize_controls do - Precursor - control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", " Repeater Demo")) create datasource.make_news + create repeater.make (datasource) create search_query.make (create {GOOGLE_AUTOCOMPLETION}.make) search_query.add_class ("form-control") + + Precursor + control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", " Repeater Demo")) search_query.set_change_event (agent change_query) control.add_control (search_query) control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h2", "", "Results")) - create repeater.make (datasource) + control.add_control (repeater) navbar.set_active (3) end diff --git a/draft/library/server/wsf_js_widget/examples/demo/sample_page.e b/draft/library/server/wsf_js_widget/examples/demo/sample_page.e index 4797b42c..ebcfb6b5 100644 --- a/draft/library/server/wsf_js_widget/examples/demo/sample_page.e +++ b/draft/library/server/wsf_js_widget/examples/demo/sample_page.e @@ -28,7 +28,6 @@ feature cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING_32]] source: INCREASING_PROGRESSSOURCE do - Precursor create form.make --Number 1 create textbox1.make ({STRING_32} "1") @@ -64,24 +63,33 @@ feature form.add_control (cats_container) --Button 1 create button1.make ("Update") - button1.set_click_event (agent handle_click) button1.add_class ("col-lg-offset-2") form.add_control (button1) --Button 2 create button2.make ("Start Modal Grid") - button2.set_click_event (agent run_modal) form.add_control (button2) --Result create result_html.make ("p", "") form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING_32]}.make ("Result", result_html)) - control.add_control (form) --Progress bar - control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h4", "", "Autoincrementing progressbar")) create source.make create progress.make_with_source (source) source.set_control (progress) progress.set_isolation (true) + + + Precursor + + control.add_control (form) + + -- Actions + button1.set_click_event (agent handle_click) + button2.set_click_event (agent run_modal) + + + --Progress bar + control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h4", "", "Autoincrementing progressbar")) control.add_control (progress) navbar.set_active (1) end diff --git a/draft/library/server/wsf_js_widget/examples/demo/slider_page.e b/draft/library/server/wsf_js_widget/examples/demo/slider_page.e index 448aca56..5ed55b75 100644 --- a/draft/library/server/wsf_js_widget/examples/demo/slider_page.e +++ b/draft/library/server/wsf_js_widget/examples/demo/slider_page.e @@ -20,7 +20,6 @@ feature -- Implementation initialize_controls do - Precursor create slider.make --slider.add_control (form, Void) --slider.add_image ("http://www.placesmustseen.com/wp-content/uploads/2013/01/paris-eiffel-tower.jpg", "Eiffel Tower") @@ -28,6 +27,8 @@ feature -- Implementation slider.add_image ("http://31.media.tumblr.com/5b5ae35c4f88d4b80aeb21e36263c6e6/tumblr_mtw7mhZsCe1st5lhmo1_1280.jpg", "landscape") slider.add_image ("http://25.media.tumblr.com/403969159fb1642e67ed702f28e966e0/tumblr_muuig0890N1st5lhmo1_1280.jpg", "landscape") slider.add_image ("http://24.media.tumblr.com/d349779e7216167e7c0ca3af66817794/tumblr_mufrlh9WqW1st5lhmo1_1280.jpg", "landscape") + + Precursor control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", " Image Slider Demo")) control.add_control (slider) navbar.set_active (4) diff --git a/draft/library/server/wsf_js_widget/examples/demo/upload_page.e b/draft/library/server/wsf_js_widget/examples/demo/upload_page.e index 454fdd15..351e43ec 100644 --- a/draft/library/server/wsf_js_widget/examples/demo/upload_page.e +++ b/draft/library/server/wsf_js_widget/examples/demo/upload_page.e @@ -21,20 +21,25 @@ feature -- Implementation initialize_controls local do + create form.make + create filebox.make + create n1_container.make ("File Upload", filebox) + create filebox2.make + create n2_container.make ("Auto start Upload", filebox2) + create filebox3.make_with_image_preview + create n3_container.make ("Image Upload", filebox3) + create button1.make ("Update") + Precursor control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", "File Upload Demo")) - create form.make + --File - create filebox.make filebox.set_upload_function (agent upload_file) filebox.set_upload_done_event (agent submit_form) - create n1_container.make ("File Upload", filebox) n1_container.add_validator (create {WSF_FILESIZE_VALIDATOR}.make (10000000, "File must be smaller than 10MB")) form.add_control (n1_container) --File - create filebox2.make filebox2.set_upload_function (agent upload_file) - create n2_container.make ("Auto start Upload", filebox2) filebox2.set_change_event (agent do n1_container.validate @@ -45,15 +50,13 @@ feature -- Implementation n2_container.add_validator (create {WSF_FILESIZE_VALIDATOR}.make (10000000, "File must be smaller than 10MB")) form.add_control (n2_container) --Image - create filebox3.make_with_image_preview + filebox3.set_upload_function (agent upload_file) filebox3.set_upload_done_event (agent submit_form) - create n3_container.make ("Image Upload", filebox3) n3_container.add_validator (create {WSF_FILESIZE_VALIDATOR}.make (10000000, "File must be smaller than 10MB")) form.add_control (n3_container) --Button 1 - create button1.make ("Update") button1.set_click_event (agent submit_form) button1.add_class ("col-lg-offset-2") form.add_control (button1)