Mercurial > ajaxUpload
changeset 9:663815040fd8
Fixes from Patrick Hurst
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Mon, 24 Feb 2014 14:00:49 -0500 |
| parents | ccf9d9961e32 |
| children | 56f60f3b0b1e |
| files | examples/server.ur examples/server.urp src/ur/ajaxUpload.ur |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/server.ur Sat Jul 21 10:40:23 2012 -0400 +++ b/examples/server.ur Mon Feb 24 14:00:49 2014 -0500 @@ -3,9 +3,9 @@ table images : { Id : int, MimeType : string, Content : blob } PRIMARY KEY Id -fun choice b = +fun choice auto = status <- source <xml/>; - au <- AjaxUpload.render {SubmitLabel = if b then None else Some "Upload it!", + au <- AjaxUpload.render {SubmitLabel = if auto then None else Some "Upload it!", OnBegin = set status <xml>Uploading</xml>, OnError = set status <xml><b>Upload failed!</b></xml>, OnSuccess = fn h =>
--- a/examples/server.urp Sat Jul 21 10:40:23 2012 -0400 +++ b/examples/server.urp Mon Feb 24 14:00:49 2014 -0500 @@ -3,5 +3,6 @@ database dbname=test sql server.sql allow mime image/jpeg +allow mime image/png server
--- a/src/ur/ajaxUpload.ur Sat Jul 21 10:40:23 2012 -0400 +++ b/src/ur/ajaxUpload.ur Mon Feb 24 14:00:49 2014 -0500 @@ -45,7 +45,7 @@ submitId <- fresh; submitId' <- return (AjaxUploadFfi.idToString submitId); let - fun upload r = + fun uploadAction r = if Option.isNone (checkMime (fileMimeType r.File)) then return <xml><body>{AjaxUploadFfi.notifyError (AjaxUploadFfi.stringToId submitId')}</body></xml> else @@ -59,7 +59,7 @@ return <xml> <form> <upload{#File}/> - <submit value={Option.get "" sl} action={upload} id={submitId} onmousedown={fn _ => ob} onkeydown={fn ev => os ev.KeyCode} onmouseup={fn _ => oe}/> + <submit value={Option.get "" sl} action={uploadAction} id={submitId} onmousedown={fn _ => ob} onkeydown={fn ev => os ev.KeyCode} onmouseup={fn _ => oe}/> </form> {AjaxUploadFfi.tweakForm (Option.isNone sl) iframeId submitId} </xml>