steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

html.forms: Rename

db4
Doug Coleman 2013-03-24 10:09:16 -07:00
parent b491b5aeb6
commit b22ca7574b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/html/forms/forms-tests.factor
View File

@ -18,7 +18,7 @@ IN: html.forms.tests
[ t ] [ [ t ] [
[ [
"140" [ v-number 13 v-min-value 100 v-max-value ] validate "140" [ v-number 13 v-min-value 100 v-max-value ] validate
[ validation-error? ] [ validation-error-state? ]
[ value>> "140" = ] [ value>> "140" = ]
bi and bi and
] with-validation ] with-validation
@ -38,7 +38,7 @@ person {
validate-values validate-values
validation-failed? validation-failed?
"age" value "age" value
[ validation-error? ] [ validation-error-state? ]
[ message>> "required" = ] [ message>> "required" = ]
bi and bi and
] with-validation ] with-validation

8
basis/html/forms/forms.factor
View File

@ -80,9 +80,9 @@ SYMBOL: nested-forms
] with-scope ] with-scope
] dip set-value ; inline ] dip set-value ; inline
TUPLE: validation-error value message ; TUPLE: validation-error-state value message ;
C: <validation-error> validation-error C: <validation-error-state> validation-error-state
: validation-error ( message -- ) : validation-error ( message -- )
form get form get
@ -96,11 +96,11 @@ C: <validation-error> validation-error
>hashtable "validators" set-word-prop ; >hashtable "validators" set-word-prop ;
: validate ( value quot -- result ) : validate ( value quot -- result )
'[ _ call( value -- validated ) ] [ <validation-error> ] recover ; '[ _ call( value -- validated ) ] [ <validation-error-state> ] recover ;
: validate-value ( name value quot -- ) : validate-value ( name value quot -- )
validate validate
dup validation-error? [ form get t >>validation-failed drop ] when dup validation-error-state? [ form get t >>validation-failed drop ] when
swap set-value ; swap set-value ;
: validate-values ( assoc validators -- ) : validate-values ( assoc validators -- )