src/lib/wf_multipart.erl @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>currentDocument</key> - <string>src/lib/wf_handle_postback_multipart.erl</string> <key>documents</key> <array> <dict> @@ -643,7 +641,7 @@ <key>filename</key> <string>src/lib/wf_handle.erl</string> <key>lastUsed</key> - <date>2009-03-24T03:17:40Z</date> + <date>2009-03-25T23:04:21Z</date> </dict> <dict> <key>filename</key> @@ -661,7 +659,7 @@ <key>filename</key> <string>src/lib/wf_handle_postback_multipart.erl</string> <key>lastUsed</key> - <date>2009-03-24T03:26:30Z</date> + <date>2009-03-25T23:04:20Z</date> </dict> <dict> <key>filename</key> @@ -1188,34 +1186,6 @@ <key>firstVisibleLine</key> <integer>0</integer> </dict> - <key>src/lib/wf_handle.erl</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>28</integer> - <key>line</key> - <integer>24</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>10</integer> - </dict> - <key>src/lib/wf_handle_postback_multipart.erl</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>0</integer> - <key>line</key> - <integer>3</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>1</integer> - </dict> <key>src/lib/wf_redirect.erl</key> <dict> <key>caret</key> @@ -1391,11 +1361,6 @@ <integer>0</integer> </dict> </dict> - <key>openDocuments</key> - <array> - <string>src/lib/wf_handle_postback_multipart.erl</string> - <string>src/lib/wf_handle.erl</string> - </array> <key>showFileHierarchyDrawer</key> <true/> <key>treeState</key> Nitrogen.tmproj @@ -12,7 +12,30 @@ headline() -> "Upload Example". right() -> linecount:render(). body() -> [ - #upload { id=myUpload } + + #h3 { text="Upload Example #1" }, + #p{}, + "Upload example with modified button text. The default text is 'Upload'.", + #p{}, + #upload { tag=myUpload1, button_text="Upload File" }, + + #hr{}, + + #h3 { text="Upload Example #2" }, + #p{}, + "This example hides he upload button. When the user selects a file it will automatically start uploading.", + #p{}, + #upload { tag=myUpload1, show_button=false } + ]. -event(_) -> ok. \ No newline at end of file +event(_) -> ok. + +upload_event(_Tag, undefined, _) -> + wf:flash("Please select a file."), + ok; + +upload_event(_Tag, FileName, LocalFileData) -> + FileSize = filelib:file_size(LocalFileData), + wf:flash(wf:f("Uploaded file: ~s (~p bytes)", [FileName, FileSize])), + ok. \ No newline at end of file Quickstart/src/samples/web_samples_upload.erl @@ -73,7 +73,7 @@ -define(CONTROL_BASE(Module), ?ELEMENT_BASE(Module), tag). -record(inplace_textbox, {?CONTROL_BASE(element_inplace_textbox), text="", html_encode=true, start_mode=view, validators=[]}). -record(wizard, {?CONTROL_BASE(element_wizard), titles, steps }). --record(upload, {?CONTROL_BASE(element_upload)}). +-record(upload, {?CONTROL_BASE(element_upload), show_button=true, button_text="Upload" }). %%% Actions %%% -define(ACTION_BASE(Module), module=Module, trigger, target, actions, show_if=true). include/wf.inc @@ -15,13 +15,17 @@ reflect() -> record_info(fields, upload). % - Does document.parentNode always work in an iframe? render(ControlID, Record) -> + ShowButton = Record#upload.show_button, + ButtonText = Record#upload.button_text, FormID = wf:temp_id(), IFrameID = wf:temp_id(), SubmitJS = wf:f("Nitrogen.$upload(obj('~s'));", [FormID]), - % wf:wire(ControlID, #event { type=change, actions=SubmitJS }), - PostbackInfo = action_event:make_postback_info(Record#upload.tag, upload, ControlID, ControlID, ?MODULE), - + + % If the button is invisible, then start uploading when the user selects a file. + wf:wire(ControlID, #event { show_if=(not ShowButton), type=change, actions=SubmitJS }), + + % Render the controls and hidden iframe... FormContent = [ wf_tags:emit_tag(input, [ {id, ControlID}, @@ -41,7 +45,7 @@ render(ControlID, Record) -> {value, ""} ]), - wf:render(#button { text="Upload", actions=#event { type=click, actions=SubmitJS } }) + wf:render(#button { show_if=ShowButton, text=ButtonText, actions=#event { type=click, actions=SubmitJS } }) ], [ @@ -56,10 +60,11 @@ render(ControlID, Record) -> wf_tags:emit_tag(iframe, [], [ {id, IFrameID}, {name, IFrameID}, - {style, "width: 300px; height: 100px;"} + {style, "display: none; width: 300px; height: 100px;"} ]) ]. -event(Tag) -> - ?PRINT(Tag), +event({upload, Tag, Filename, LocalFileData}) -> + Delegate = wf_platform:get_page_module(), + Delegate:upload_event(Tag, Filename, LocalFileData), ok. \ No newline at end of file src/elements/forms/element_upload.erl @@ -30,7 +30,7 @@ check_multipart_postback(Module) -> check_request_method(Module) -> % Get the query... - Query = case wf_platform:request_method() of + Query = case wf_platform:get_request_method() of 'GET' -> wf_platform:parse_get_args(); 'POST' -> wf_platform:parse_post_args() end, @@ -38,7 +38,7 @@ check_request_method(Module) -> wf_query:prepare_request_query_paths(Query), % Check if this is the first request or a postback... - IsFirstRequest = wf_platform:request_method() == 'GET' andalso wf:q(postbackInfo) == [], + IsFirstRequest = wf_platform:get_request_method() == 'GET' andalso wf:q(postbackInfo) == [], case IsFirstRequest of true -> wf_handle_firstrequest:handle_request(Module); false -> wf_handle_postback:handle_request(Module) src/lib/wf_handle.erl @@ -7,41 +7,37 @@ -export ([handle_request/1]). handle_request(Module) -> - Request = wf_platform:get_request(), - ?PRINT(mochiweb_multipart:parse_multipart_request(Request, fun callback/1)), - wf_platform:set_response_body("Done"), - wf_platform:build_response(). + % Parse the template... + {ok, Query, FileName, LocalFileData} = wf_multipart:parse_upload(), + put(request_query, Query), + wf_query:prepare_request_query_paths(Query), + -callback(X) -> - ?PRINT(X), - F = fun(Y) -> callback(Y) end, - F. + % Get the event that triggered the postback... + [PostbackInfo] = wf:q(postbackInfo), + {ObjectID, Tag, _EventType, TriggerID, TargetID, Delegate} = wf:depickle(PostbackInfo), + + % Find the delegate... + Module1 = case Delegate of + undefined -> Module; + _ -> Delegate + end, + + % Setup the response... + put(current_id, ObjectID), + put(current_path, wf_path:to_path(TargetID)), - % % Get the event that triggered the postback... - % [PostbackInfo] = wf:q(postbackInfo), - % {ObjectID, Tag, _EventType, TriggerID, TargetID, Delegate} = wf:depickle(PostbackInfo), - % - % % Find the delegate... - % Module1 = case Delegate of - % undefined -> Module; - % _ -> Delegate - % end, - % - % % Get the filename... - % File = case wf:q(TriggerID) of - % [X] -> X; - % _ -> undefined - % end, - % - % % Create the postback... - % NewTag = {upload, Tag, File}, - % Postback = action_event:make_postback(NewTag, upload_finished, TriggerID, TargetID, Module1), - % - % % Send the response... - % wf_platform:set_content_type("text/html"), - % wf_platform:set_response_body([ - % "<html><body><script>", - % wf:f("window.parent.~s.", [ObjectID]), Postback, - % "</script></body></html>" - % ]), - % wf_platform:build_response(). \ No newline at end of file + % Create the postback... + NewTag = {upload, Tag, FileName, LocalFileData}, + Postback = action_event:make_postback(NewTag, upload_finished, TriggerID, TargetID, Module1), + + % Send the response... + wf_platform:set_content_type("text/html"), + wf_platform:set_response_body([ + "<html><body><script>", + "var Nitrogen = window.parent.Nitrogen;", + wf:me_var(), + Postback, + "</script></body></html>" + ]), + wf_platform:build_response(). \ No newline at end of file src/lib/wf_handle_postback_multipart.erl @@ -12,7 +12,8 @@ get_raw_path/0, get_querystring/0, - request_method/0, + get_request_method/0, + get_request_body/0, parse_get_args/0, parse_post_args/0, @@ -24,6 +25,8 @@ set_redirect/1, set_header/2, get_peername/0, + get_socket/0, + recv_from_socket/2, route/1, request/1, set_response_code/1, set_content_type/1, @@ -49,6 +52,7 @@ do(Method, Args) -> get_platform() -> do(get_platform). get_request() -> get(wf_request). +get_request_body() -> do(get_request_body). get_page_module() -> get(wf_page_module). set_page_module(Module) -> put(wf_page_module, Module). get_path_info() -> get(wf_path_info). @@ -60,7 +64,7 @@ get_querystring() -> do(get_querystring). %%% METHOD AND ARGS %%% -request_method() -> do(request_method). +get_request_method() -> do(get_request_method). parse_get_args() -> do(parse_get_args). parse_post_args() -> do(parse_post_args). @@ -104,8 +108,10 @@ set_header(Key, Value) -> %%% SOCKETS %%% +get_socket() -> do(get_socket). +get_peername() -> inet:peername(get_socket). +recv_from_socket(Length, Timeout) -> do(recv_from_socket, [Length, Timeout]). -get_peername() -> do(get_peername). %%% ROUTE AND REQUEST %%% @@ -158,7 +164,7 @@ handle_redirects() -> build_redirect(Url) -> Url1 = wf:to_list(Url), - case request_method() of + case get_request_method() of 'GET' -> build_get_redirect(Url1); 'POST' -> build_post_redirect(Url1) end. src/lib/wf_platform.erl @@ -9,7 +9,8 @@ get_raw_path/0, get_querystring/0, - request_method/0, + get_request_method/0, + get_request_body/0, get_headers/0, get_header/1, @@ -24,7 +25,8 @@ build_response/0, - get_peername/0 + get_socket/0, + recv_from_socket/2 ]). get_platform() -> inets. @@ -43,9 +45,13 @@ get_querystring() -> _ -> tl(QueryString) end. -request_method() -> +get_request_method() -> Info = wf_platform:get_request(), wf:to_atom(Info#mod.method). + +get_request_body() -> + Req = wf_platform:get_request(), + Req#mod.entity_body. parse_get_args() -> QueryString = get_querystring(), @@ -153,6 +159,13 @@ build_response() -> %%% SOCKETS %%% -get_peername() -> +get_socket() -> Info = wf_platform:get_request(), - inet:peername(Info#mod.socket). + Info#mod.socket. + +recv_from_socket(Length, Timeout) -> + Socket = get_socket(), + case gen_tcp:recv(Socket, Length, Timeout) of + {ok, Data} -> Data; + _ -> exit(normal) + end. src/lib/wf_platform_inets.erl @@ -3,12 +3,14 @@ % See MIT-LICENSE for licensing information. -module (wf_platform_mochiweb). +-include ("wf.inc"). -export ([ get_platform/0, get_raw_path/0, get_querystring/0, - request_method/0, + get_request_method/0, + get_request_body/0, parse_get_args/0, parse_post_args/0, @@ -23,7 +25,8 @@ build_response/0, - get_peername/0 + get_socket/0, + recv_from_socket/2 ]). get_platform() -> mochiweb. @@ -40,9 +43,12 @@ get_querystring() -> {_, QueryString, _} = mochiweb_util:urlsplit_path(RawPath), QueryString. -request_method() -> +get_request_method() -> Req = wf_platform:get_request(), Req:get(method). + +get_request_body() -> + undefined. parse_get_args() -> Req = wf_platform:get_request(), @@ -117,6 +123,16 @@ build_response() -> %%% SOCKETS %%% -get_peername() -> +get_socket() -> Req = wf_platform:get_request(), - inet:peername(Req:get(socket)). + Req:get(socket). + +recv_from_socket(Length, Timeout) -> + Socket = get_socket(), + case gen_tcp:recv(Socket, Length, Timeout) of + {ok, Data} -> + put(mochiweb_request_recv, true), + Data; + _Other -> + exit(normal) + end. src/lib/wf_platform_mochiweb.erl @@ -9,7 +9,8 @@ get_raw_path/0, get_querystring/0, - request_method/0, + get_request_method/0, + get_request_body/0, parse_get_args/0, parse_post_args/0, @@ -23,7 +24,8 @@ build_response/0, - get_peername/0 + get_socket/0, + recv_from_socket/2 ]). get_platform() -> yaws. @@ -38,10 +40,17 @@ get_querystring() -> Arg = wf_platform:get_request(), Arg#arg.querydata. -request_method() -> +get_request_method() -> Arg = wf_platform:get_request(), (Arg#arg.req)#http_request.method. +get_request_body() -> + Arg = wf_platform:get_request(), + case Arg#arg.clidata of + {partial, Data} -> Data; + Data -> Data + end. + parse_get_args() -> Arg = wf_platform:get_request(), yaws_api:parse_query(Arg). @@ -123,6 +132,13 @@ build_response() -> %%% SOCKETS %%% -get_peername() -> +get_socket() -> Arg = wf_platform:get_request(), - inet:peername(Arg#arg.clisock). + Arg#arg.clisock. + +recv_from_socket(Length, Timeout) -> + Socket = get_socket(), + case gen_tcp:recv(Socket, Length, Timeout) of + {ok, Data} -> Data; + _ -> exit(normal) + end. src/lib/wf_platform_yaws.erl @@ -20,14 +20,6 @@ restore_state() -> put(wf_state, wf:depickle(DomState)) end. -% restore_state_from_post(Query) -> -% {value, {_, DomState}} = lists:keysearch("domState", 1, Query), -% case DomState of -% undefined -> ignore; -% _ -> -% put(wf_state, wf:depickle(DomState)) -% end. - %%% STATE %%% %state/1 - Get the value for Key. src/lib/wf_state.erl @@ -19,7 +19,8 @@ get_session_timeout/0, get_sign_key/0, get_wwwroot/0, - get_hooks_module/0 + get_hooks_module/0, + get_scratch_directory/0 ]). start() -> start(undefined). @@ -133,6 +134,12 @@ get_hooks_module() -> {ok, {Module, _}} = application:get_key(mod), Module end. + +get_scratch_directory() -> + case get_env(serving_app(), scratch_directory) of + {ok, Val} -> Val; + _ -> "./scratch" + end. serving_app() -> case get_env(nitrogen, serving_app) of src/nitrogen.erl @@ -253,7 +253,8 @@ N.prototype.$do_windex_comet = function(postbackInfo) { N.$upload = function(form) { var n = Nitrogen.$lookup(Nitrogen.$current_id); form.domState.value = n.$dom_state; - form.submit(); + form.submit(); + form.reset(); } /*** SERIALIZATION ***/ @@ -264,7 +265,10 @@ N.prototype.$get_elements_to_serialize = function() { for (var i=0; i<tagnames.length; i++) { var l = this.$div.getElementsByTagName(tagnames[i]); for (var j=0; j<l.length; j++) { - a = a.concat(l[j]); + var elementName = l[j].name; + if (elementName != "domState" && elementName != "postbackInfo") { + a = a.concat(l[j]); + } } } www/nitrogen.js 38ed68c5b6b78866c4b0c07be9ec4adf52904c59 Rusty Klophaus rklophaus@gmail.com http://github.com/rklophaus/nitrogen/commit/fbc2a7536bc268b58f285a78aca3ca2e1a9d94ce fbc2a7536bc268b58f285a78aca3ca2e1a9d94ce 2009-03-28T17:23:37-07:00 2009-03-28T17:23:37-07:00 Finish file upload support. 42a4708d8eec866f8e90afdb41dd85b408c81401 Rusty Klophaus rklophaus@gmail.com