Merge branch 'widget_slider' into widget

Conflicts: draft/library/wsf_js_widget/kernel/webcontrol/wsf_control.e examples/widgetapp/base_page.e
2013-10-29 15:39:32 +01:00
parent 01327a4b06 61f032a819
commit ac31e1c29e
17 changed files with 161 additions and 87 deletions
--- a/examples/widgetapp/application.e
+++ b/examples/widgetapp/application.e
@@ -129,7 +129,7 @@ feature -- Execution

 	slider_demo (request: WSF_REQUEST; response: WSF_RESPONSE)
 		local
-			page: IMAGE_SLIDER_PAGE
+			page: SLIDER_PAGE
 		do
 				-- To send a response we need to setup, the status code and
 				-- the response headers.