From 40bb88a55f5578175fb4a930b77c41be0226aa8b Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sun, 10 Nov 2013 16:53:21 +0100 Subject: [PATCH] Validate all fields and make regexp stricter --- .../wsf_js_widget/kernel/validator/wsf_regexp_validator.e | 3 ++- .../library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e index 95fd6d94..ccb74c3e 100644 --- a/draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e +++ b/draft/library/wsf_js_widget/kernel/validator/wsf_regexp_validator.e @@ -35,7 +35,8 @@ feature -- Implementation if not regexp.is_compiled then regexp.compile (regexp_string) end - Result := regexp.matches (input) + + Result := (not input.is_empty) and regexp.matches (input) end feature -- State diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e index 42bb258a..e30ea200 100644 --- a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e +++ b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_control.e @@ -36,8 +36,6 @@ feature -- Validation is_valid := True across controls as c - until - is_valid = False loop if attached {WSF_VALIDATABLE} c.item as elem then elem.validate