src/actions/action_function.erl www/bert.js @@ -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/actions/action_update.erl</string> <key>documents</key> <array> <dict> @@ -78,8 +76,6 @@ <string>src/lib</string> </dict> <dict> - <key>expanded</key> - <true/> <key>name</key> <string>actions</string> <key>regexFolderFilter</key> @@ -112,8 +108,6 @@ <string>src/handlers</string> </dict> </array> - <key>expanded</key> - <true/> <key>name</key> <string>SRC</string> </dict> @@ -215,34 +209,6 @@ <integer>279</integer> <key>metaData</key> <dict> - <key>src/actions/action_update.erl</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>37</integer> - <key>line</key> - <integer>60</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>39</integer> - </dict> - <key>src/lib/wf_context.erl</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>0</integer> - <key>line</key> - <integer>120</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>93</integer> - </dict> <key>src/nitrogen.erl</key> <dict> <key>caret</key> @@ -272,11 +238,6 @@ <integer>0</integer> </dict> </dict> - <key>openDocuments</key> - <array> - <string>src/actions/action_update.erl</string> - <string>src/lib/wf_context.erl</string> - </array> <key>showFileHierarchyDrawer</key> <true/> <key>windowFrame</key> Nitrogen.tmproj @@ -65,7 +65,7 @@ -define(ELEMENT_BASE(Module), is_element=is_element, module=Module, id, actions, show_if=true, class="", style=""). -record(elementbase, {?ELEMENT_BASE(undefined)}). -record(template, {?ELEMENT_BASE(element_template), file, bindings=[] }). --record(function, {?ELEMENT_BASE(element_function), function=fun() -> [] end}). +-record(function_el, {?ELEMENT_BASE(element_function), function=fun() -> [] end}). -record(body, {?ELEMENT_BASE(element_body), title="", body=[]}). -record(h1, {?ELEMENT_BASE(element_h1), text="", html_encode=true}). -record(h2, {?ELEMENT_BASE(element_h2), text="", html_encode=true}). @@ -78,21 +78,21 @@ -record(p, {?ELEMENT_BASE(element_p), body=""}). -record(label, {?ELEMENT_BASE(element_label), text="", html_encode=true}). -record(value, {?ELEMENT_BASE(element_value), text="", html_encode=true}). --record(link, {?ELEMENT_BASE(element_link), text="", body="", html_encode=true, url="javascript:", postback}). +-record(link, {?ELEMENT_BASE(element_link), text="", body="", html_encode=true, url="javascript:", postback, delegate}). -record(error, {?ELEMENT_BASE(element_error), text="", html_encode=true}). -record(span, {?ELEMENT_BASE(element_span), text="", html_encode=true}). --record(button, {?ELEMENT_BASE(element_button), text="Button", html_encode=true, postback}). +-record(button, {?ELEMENT_BASE(element_button), text="Button", html_encode=true, postback, delegate}). -record(literal, {?ELEMENT_BASE(element_literal), text="", html_encode=true}). --record(textbox, {?ELEMENT_BASE(element_textbox), text="", html_encode=true, next, postback}). +-record(textbox, {?ELEMENT_BASE(element_textbox), text="", html_encode=true, next, postback, delegate}). -record(hidden, {?ELEMENT_BASE(element_hidden), text="", html_encode=true}). -record(textarea, {?ELEMENT_BASE(element_textarea), text="", html_encode=true}). -record(datepicker_textbox, {?ELEMENT_BASE(element_datepicker_textbox), text="", next, html_encode=true, validators=[], options = [{dateFormat, "yy-mm-dd"}] }). --record(dropdown, {?ELEMENT_BASE(element_dropdown), options=[], html_encode=true, postback, value}). +-record(dropdown, {?ELEMENT_BASE(element_dropdown), options=[], html_encode=true, postback, delegate, value}). -record(option, { text="", value="", selected=false }). --record(checkbox, {?ELEMENT_BASE(element_checkbox), text="", html_encode=true, checked=false, postback}). +-record(checkbox, {?ELEMENT_BASE(element_checkbox), text="", html_encode=true, checked=false, postback, delegate}). -record(radiogroup, {?ELEMENT_BASE(element_radiogroup), body=[]}). --record(radio, {?ELEMENT_BASE(element_radio), text="", html_encode=true, value, name, checked=false, postback}). --record(password, {?ELEMENT_BASE(element_password), text="", html_encode=true, next, postback}). +-record(radio, {?ELEMENT_BASE(element_radio), text="", html_encode=true, value, name, checked=false, postback, delegate}). +-record(password, {?ELEMENT_BASE(element_password), text="", html_encode=true, next, postback, delegate}). -record(panel, {?ELEMENT_BASE(element_panel), body=""}). -record(spinner, {?ELEMENT_BASE(element_spinner), image="/nitrogen/spinner.gif"}). -record(image, {?ELEMENT_BASE(element_image), image="", alt}). @@ -124,9 +124,10 @@ -record(comet, {?ACTION_BASE(action_comet), pool=undefined, scope=local, function, dying_message}). -record(continue, {?ACTION_BASE(action_continue), function, delegate, tag, timeout}). -record(api, {?ACTION_BASE(action_api), name, tag, delegate }). +-record(function, {?ACTION_BASE(action_function), function }). -record(set, {?ACTION_BASE(action_set), value}). -record(redirect, {?ACTION_BASE(action_redirect), url}). --record(event, {?ACTION_BASE(action_event), type=default, delay=0, postback, delegate, extra_param}). +-record(event, {?ACTION_BASE(action_event), type=default, keycode=undefined, delay=0, postback, delegate, extra_param}). -record(validate, {?ACTION_BASE(action_validate), on=submit, success_text=" ", validators, attach_to }). -record(validation_error, {?ACTION_BASE(action_validation_error), text="" }). -record(alert, {?ACTION_BASE(action_alert), text=""}). include/wf.inc @@ -47,17 +47,15 @@ comet(F) -> %% @doc Convenience method to start a comet process. comet(F, Pool) -> - SeriesID = wf_context:series_id(), - wf:wire(#comet { function=F, pool=Pool, scope=local }), - {ok, PoolPid} = get_pool_pid(SeriesID, Pool, local), - PoolPid. + Pid = spawn_with_context(F), + wf:wire(#comet { function=Pid, pool=Pool, scope=local }), + {ok, Pid}. %% @doc Convenience method to start a comet process with global pool. comet_global(F, Pool) -> - SeriesID = wf_context:series_id(), - wf:wire(#comet { function=F, pool=Pool, scope=global }), - {ok, PoolPid} = get_pool_pid(SeriesID, Pool, global), - PoolPid. + Pid = spawn_with_context(F), + wf:wire(#comet { function=Pid, pool=Pool, scope=global }), + {ok, Pid}. %% @doc Gather all wired actions, and send to the accumulator. flush() -> @@ -111,9 +109,10 @@ event({spawn_async_function, Record}) -> {ok, PoolPid} = get_pool_pid(SeriesID, Pool, Scope), % Create a process for the AsyncFunction... - AsyncFunction = Record#comet.function, - Context = wf_context:context(), - FunctionPid = erlang:spawn(fun() -> wf_context:context(Context), AsyncFunction(), flush() end), + FunctionPid = case Record#comet.function of + F when is_function(F) -> spawn_with_context(F); + P when is_pid(P) -> P + end, % Create a process for the AsyncGuardian... DyingMessage = Record#comet.dying_message, @@ -128,6 +127,8 @@ event({spawn_async_function, Record}) -> "if (!document.comet_started) { document.comet_started=true; ", make_async_event(0), " }" ], wf:wire(Actions); + + % This clause is the heart of async functions. It % is first triggered by the event/1 function above, @@ -187,12 +188,17 @@ get_pool_pid(SeriesID, Pool, Scope) -> % and is responsible for distributing messages to all processes in the pool. pool_loop(Processes) -> receive - {add_process, Pid} -> - erlang:monitor(process, Pid), - pool_loop([Pid|Processes]); + {add_process, JoinPid} -> + erlang:monitor(process, JoinPid), + case Processes of + [] -> JoinPid!'INIT'; + _ -> [Pid!{'JOIN', JoinPid} || Pid <- Processes] + end, + pool_loop([JoinPid|Processes]); - {'DOWN', _, process, Pid, _} -> - pool_loop(Processes -- [Pid]); + {'DOWN', _, process, LeavePid, _} -> + [Pid!{'LEAVE', LeavePid} || Pid <- Processes], + pool_loop(Processes -- [LeavePid]); Message -> [Pid!Message || Pid <- Processes], @@ -233,11 +239,11 @@ accumulator_loop(Guardians, Actions, Waiting, TimerRef) -> accumulator_loop(Guardians, [], Pid, TimerRef); {get_actions_blocking, Pid} when Actions /= [] -> - Pid!{actions, Actions}, + Pid!{actions, lists:reverse(Actions)}, accumulator_loop(Guardians, [], none, TimerRef); {get_actions, Pid} -> - Pid!{actions, Actions}, + Pid!{actions, lists:reverse(Actions)}, accumulator_loop(Guardians, [], none, TimerRef); {set_lease, LengthInMS} -> @@ -265,13 +271,19 @@ guardian_process(FunctionPid, AccumulatorPid, PoolPid, DyingMessage) -> {'DOWN', _, process, FunctionPid, _} -> % The AsyncFunction process has died. % Communicate dying_message to the pool and exit. - PoolPid!DyingMessage; + case DyingMessage of + undefined -> ignore; + _ -> PoolPid!DyingMessage + end; {'DOWN', _, process, AccumulatorPid, _} -> % The accumulator process has died. % Communicate dying_message to the pool, % kill the AsyncFunction process, and exit. - PoolPid!DyingMessage, + case DyingMessage of + undefined -> ignore; + _ -> PoolPid!DyingMessage + end, erlang:exit(FunctionPid, async_die); {'DOWN', _, process, PoolPid, _} -> @@ -286,8 +298,13 @@ guardian_process(FunctionPid, AccumulatorPid, PoolPid, DyingMessage) -> %%% PRIVATE FUNCTIONS %%% +spawn_with_context(Function) -> + Context = wf_context:context(), + erlang:spawn(fun() -> wf_context:context(Context), wf_context:clear_actions(), Function(), flush() end). + + inner_send(Pool, Scope, Message) -> - ?PRINT({Pool, Scope, Message}), + % ?PRINT({Pool, Scope, Message}), SeriesID = wf_context:series_id(), {ok, PoolPid} = get_pool_pid(SeriesID, Pool, Scope), PoolPid!Message, src/actions/action_comet.erl @@ -6,7 +6,7 @@ -include ("wf.inc"). -compile(export_all). -render_action(#event { postback=Postback, actions=Actions, trigger=Trigger, target=Target, type=Type, delay=Delay, delegate=Delegate, extra_param=ExtraParam}) -> +render_action(#event { postback=Postback, actions=Actions, trigger=Trigger, target=Target, type=Type, keycode=KeyCode, delay=Delay, delegate=Delegate, extra_param=ExtraParam}) -> PostbackScript = wf_event:generate_postback_script(Postback, Trigger, Target, Delegate, ExtraParam), SystemPostbackScript = wf_event:generate_system_postback_script(Postback, Trigger, Target, Delegate), WireAction = #wire { trigger=Trigger, target=Target, actions=Actions }, @@ -29,14 +29,25 @@ render_action(#event { postback=Postback, actions=Actions, trigger=Trigger, targ ]; %%% USER EVENTS %%% - % Run the event when an enter key is hit, such as in an input textbox + + % Handle keypress, keydown, or keyup when a keycode is defined... + _ when (Type==keypress orelse Type==keydown orelse Type==keyup) andalso (KeyCode /= undefined) -> + [ + wf:f("Nitrogen.$observe_event(obj('~s'), '~s', function anonymous(event) {", [wf:to_js_id(Trigger), Type]), + wf:f("if (Nitrogen.$is_key_code(event, ~p)) { ", [KeyCode]), + PostbackScript, WireAction, + "return false; }});" + ]; + + % Convenience method for Enter Key... enterkey -> [ - wf:f("Nitrogen.$observe_event(obj('~s'), 'keypress', function anonymous(event) {", [wf:to_js_id(Trigger)]), - "if (Nitrogen.$is_enter_key(event)) {", PostbackScript, WireAction, "return false; }", - "});" + wf:f("Nitrogen.$observe_event(obj('~s'), '~s', function anonymous(event) {", [wf:to_js_id(Trigger), keydown]), + wf:f("if (Nitrogen.$is_key_code(event, ~p)) { ", [13]), + PostbackScript, WireAction, + "return false; }});" ]; - + % Run the event after a specified amount of time timer -> TempID = wf:temp_id(), src/actions/action_event.erl @@ -8,10 +8,17 @@ % This action is used internally by Nitrogen. render_action(Record) -> - DefaultTrigger = Record#wire.trigger, - DefaultTarget = Record#wire.target, - Actions = set_paths(DefaultTrigger, DefaultTarget, Record#wire.actions), - [Actions]. + try + DefaultTrigger = Record#wire.trigger, + DefaultTarget = Record#wire.target, + Actions = set_paths(DefaultTrigger, DefaultTarget, Record#wire.actions), + [Actions] + catch Type : Error -> + ?PRINT(Type), + ?PRINT(Error), + ?PRINT(Record), + erlang:Type(Error) + end. set_paths(_DefaultTrigger, _DefaultTarget, []) -> []; @@ -40,7 +47,7 @@ wire(TriggerID, TargetID, Script) when ?IS_STRING(Script) -> wire(TriggerID, TargetID, Actions) -> CurrentPath = wf_context:current_path(), Action = #wire { trigger=CurrentPath, target=CurrentPath, actions=[ - #wire { + #wire { trigger=wf:coalesce([TriggerID, CurrentPath]), target=wf:coalesce([TargetID, CurrentPath]), actions=Actions src/actions/action_wire.erl @@ -11,7 +11,7 @@ reflect() -> record_info(fields, button). render_element(HtmlID, Record) -> case Record#button.postback of undefined -> ignore; - Postback -> wf:wire(Record#button.id, #event { type=click, postback=Postback }) + Postback -> wf:wire(Record#button.id, #event { type=click, postback=Postback, delegate=Record#button.delegate }) end, Value = [" ", wf:html_encode(Record#button.text, Record#button.html_encode), " "], src/elements/forms/element_button.erl @@ -15,7 +15,7 @@ render_element(HtmlID, Record) -> end, case Record#checkbox.postback of undefined -> ignore; - Postback -> wf:wire(Record#checkbox.id, #event { type=change, postback=Postback }) + Postback -> wf:wire(Record#checkbox.id, #event { type=change, postback=Postback, delegate=Record#checkbox.delegate }) end, Text = wf:html_encode(Record#checkbox.text, Record#checkbox.html_encode), src/elements/forms/element_checkbox.erl @@ -15,7 +15,7 @@ render_element(HtmlID, Record) -> end, case Record#password.postback of undefined -> ignore; - Postback -> wf:wire(Record#password.id, #event { type=enterkey, postback=Postback }) + Postback -> wf:wire(Record#password.id, #event { type=enterkey, postback=Postback, delegate=Record#password.delegate }) end, Value = wf:html_encode(Record#password.text, Record#password.html_encode), src/elements/forms/element_password.erl @@ -16,7 +16,7 @@ render_element(HtmlID, Record) -> case Record#radio.postback of undefined -> ignore; - Postback -> wf:wire(Record#radio.id, #event { type=change, postback=Postback }) + Postback -> wf:wire(Record#radio.id, #event { type=change, postback=Postback, delegate=Record#radio.delegate }) end, Content = wf:html_encode(Record#radio.text, Record#radio.html_encode), src/elements/forms/element_radio.erl @@ -16,7 +16,7 @@ render_element(HtmlID, Record) -> case Record#textbox.postback of undefined -> ignore; - Postback -> wf:wire(Record#textbox.id, #event { type=enterkey, postback=Postback }) + Postback -> wf:wire(Record#textbox.id, #event { type=enterkey, postback=Postback, delegate=Record#textbox.delegate }) end, Value = wf:html_encode(Record#textbox.text, Record#textbox.html_encode), src/elements/forms/element_textbox.erl @@ -11,7 +11,7 @@ reflect() -> record_info(fields, link). render_element(HtmlID, Record) -> case Record#link.postback of undefined -> ignore; - Postback -> wf:wire(Record#link.id, #event { type=click, postback=Postback }) + Postback -> wf:wire(Record#link.id, #event { type=click, postback=Postback, delegate=Record#link.delegate }) end, Body = [ src/elements/html/element_link.erl @@ -20,7 +20,11 @@ render_element(HtmlID, Record) -> #table { style="position: fixed; top: 0px; left: 0px; width: 100%; height: 100%; z-index: 99; overflow:auto;", rows=#tablerow { - cells=#tablecell { align=center, valign=middle, style="vertical-align: middle;", body=Record#lightbox.body } + cells=#tablecell { align=center, valign=middle, style="vertical-align: middle;", body=[ + "<center><table><tr><td>", + Record#lightbox.body, + "</td></tr></table></center>" + ]} } } ] src/elements/layout/element_lightbox.erl @@ -111,11 +111,11 @@ eval([script|T], Record) -> [script|eval(T, Record)]; eval([H|T], Record) when ?IS_STRING(H) -> [H|eval(T, Record)]; eval([H|T], Record) -> [replace_callbacks(H, Record)|eval(T, Record)]. -% Turn callbacks into a reference to #function {}. +% Turn callbacks into a reference to #function_el {}. replace_callbacks(CallbackTuples, Record) -> Bindings = Record#template.bindings, Functions = [convert_callback_tuple_to_function(M, F, ArgString, Bindings) || {M, F, ArgString} <- CallbackTuples], - #function { function=Functions }. + #function_el { function=Functions }. convert_callback_tuple_to_function(Module, Function, ArgString, Bindings) -> % De-reference to page module... src/elements/layout/element_template.erl @@ -11,7 +11,7 @@ reflect() -> record_info(fields, dropdown). render_element(HtmlID, Record) -> case Record#dropdown.postback of undefined -> ignore; - Postback -> wf:wire(Record#dropdown.id, #event { type=change, postback=Postback }) + Postback -> wf:wire(Record#dropdown.id, #event { type=change, postback=Postback, delegate=Record#dropdown.delegate }) end, case Record#dropdown.value of src/elements/other/element_dropdown.erl @@ -6,7 +6,7 @@ -include ("wf.inc"). -compile(export_all). -% The 'function' attribute is an Erlang function of arity 0 that returns {ok, [Elements]}. +% The 'function' attribute is an Erlang function of arity 0 that returns [Elements]. % % Elements can either be a String, a binary, more Nitrogen elements, or a combination thereof. % @@ -15,10 +15,10 @@ % one that exists and returns a value (not undefined) will % be used. -reflect() -> record_info(fields, function). +reflect() -> record_info(fields, function_el). render_element(_HtmlID, Record) -> - Functions = lists:flatten([Record#function.function]), + Functions = lists:flatten([Record#function_el.function]), call_next_function(Functions). call_next_function([]) -> []; src/elements/other/element_function.erl @@ -77,9 +77,11 @@ try_load_module(Tokens, ExtraTokens) -> BeamFile = string:join(Tokens, "_") ++ ".beam", case erl_prim_loader:get_file(BeamFile) of {ok, _, _} -> - {list_to_atom(string:join(Tokens, "_")), string:join(lists:reverse(ExtraTokens), "/")}; - undefined -> - try_load_module(tl(lists:reverse(Tokens)), [hd(lists:reverse(Tokens))|ExtraTokens]) + {list_to_atom(string:join(Tokens, "_")), string:join(ExtraTokens, "/")}; + _ -> + Tokens1 = lists:reverse(tl(lists:reverse(Tokens))), + ExtraTokens1 = [hd(lists:reverse(Tokens))|ExtraTokens], + try_load_module(Tokens1, ExtraTokens1) end. src/handlers/route/dynamic_route_handler.erl @@ -10,7 +10,7 @@ ]). init(State) -> - % Deserialize the state from domState. + % Deserialize the state from domState. {ok, State}. finish(State) -> src/handlers/state/default_state_handler.erl @@ -14,10 +14,11 @@ split_dom_paths(undefined) -> [?BASEPATH]; split_dom_paths(DomPathList) -> - { Paths, _} = split_dom_paths(DomPathList, []), - case lists:member(?BASEPATH, Paths) of - true -> Paths; - false -> [?BASEPATH|Paths] + {Paths, _} = split_dom_paths(DomPathList, []), + Paths1 = [X || X <- Paths, X /= []], + case lists:member(?BASEPATH, Paths1) of + true -> Paths1; + false -> [?BASEPATH|Paths1] end. split_dom_paths(DomPaths, Acc) -> @@ -74,7 +75,7 @@ normalize_path(Path) when is_list(Path) -> DomPaths = wf_context:dom_paths(), % Find the one matching dom path. case find_matching_dom_path(Path, DomPaths) of - [] -> throw({no_matching_dom_paths, Path, DomPaths}); + [] -> throw({dom_path_error, no_matching_paths}); [Match] -> Match; Matches -> narrow_matches_with_current_path(Matches) end. @@ -112,9 +113,9 @@ narrow_matches_with_current_path(Matches) -> CurrentPath = lists:reverse(wf_context:current_path()), Matches1 = [lists:reverse(X) || X <- Matches], case narrow_matches_with_current_path(CurrentPath, Matches1, 1) of - [] -> throw({no_matching_dom_paths, Matches}); + [] -> throw({dom_path_error, no_matching_paths}); [Match] -> lists:reverse(Match); - Matches -> throw({too_many_matching_dom_paths, Matches}) + Matches -> throw({dom_path_error, too_many_matching_paths}) end. % Similar to find_matching_dom_path, except we stop when we narrow @@ -124,7 +125,9 @@ narrow_matches_with_current_path(_, [], _) -> []; narrow_matches_with_current_path(_, Matches, _) when length(Matches) == 1 -> Matches; narrow_matches_with_current_path(Path, Matches, Pos) -> Part = lists:nth(Pos, Path), - F = fun(X) -> Part == lists:nth(Pos, X) end, + F = fun(X) -> + Pos =< length(X) andalso Part == lists:nth(Pos, X) + end, Matches1 = lists:filter(F, Matches), narrow_matches_with_current_path(Path, Matches1, Pos + 1). src/lib/wf_path.erl @@ -65,9 +65,24 @@ render_action(Action) when is_tuple(Action) -> TriggerPath = wf:coalesce([Base#actionbase.trigger, TargetPath, OldPath]), % Normalize the trigger and target... + TriggerPath1 = try + wf_path:normalize_path(TriggerPath) + catch + _Type1 : {dom_path_error, Err1} -> + ?PRINT({dom_path_error, Err1, TriggerPath, Action}), + [TriggerPath] + end, + TargetPath1 = try + wf_path:normalize_path(TargetPath) + catch + _Type2 : {dom_path_error, Err2} -> + ?PRINT({dom_path_error, Err2, TargetPath, Action}), + [TargetPath] + end, + Base1 = Base#actionbase { - trigger = wf_path:normalize_path(TriggerPath), - target = TargetPath1 = wf_path:normalize_path(TargetPath) + trigger = TriggerPath1, + target = TargetPath1 }, Action1 = wf_utils:replace_with_base(Base1, Action), src/lib/wf_render_actions.erl @@ -112,6 +112,7 @@ temp_id() -> {_, _, C} = now(), "temp" ++ integer_to_list(C). + is_temp_element(undefined) -> true; is_temp_element([P]) -> is_temp_element(P); is_temp_element(P) -> src/lib/wf_render_elements.erl @@ -22,7 +22,10 @@ run() -> Response1:build_response() end catch Type : Error -> - ?LOG("~p~n", [{error, Type, Error, erlang:get_stacktrace()}]) + ?LOG("~p~n", [{error, Type, Error, erlang:get_stacktrace()}]), + ErrResponse = Response:status_code(500), + ErrResponse1 = ErrResponse:data("Internal Server Error"), + ErrResponse1:build_response() end. run_catched() -> src/wf_core.erl @@ -166,6 +166,7 @@ NitrogenClass.prototype.$do_system_event = function(eventContext) { for (var key in this.$params) { params += key + "=" + this.$params[key] + "&"; } + params += "is_system_event=1" var n = this; @@ -175,7 +176,9 @@ NitrogenClass.prototype.$do_system_event = function(eventContext) { data: params, dataType: 'text', success: function(data, textStatus) { + var pc = n.$params["pageContext"]; eval(data); + n.$set_param("pageContext", pc); }, error: function(xmlHttpRequest, textStatus, errorThrown) { } @@ -229,9 +232,9 @@ NitrogenClass.prototype.$scan_elements = function(path, elements) { for (var i=0; i<elements.length; i++) { var t = elements[i].id; if (t == undefined) continue; - var pos = t.indexOf(path); + var pos = t.lastIndexOf(path); if (pos == -1) continue; - if (t.indexOf(path) + path.length == t.length) { + if (pos + path.length == t.length) { return elements[i]; } } @@ -278,8 +281,8 @@ NitrogenClass.prototype.$return_false = function(value, args) { return false; } -NitrogenClass.prototype.$is_enter_key = function(event) { - return (event && event.keyCode == 13); +NitrogenClass.prototype.$is_key_code = function(event, keyCode) { + return (event && event.keyCode == keyCode); } NitrogenClass.prototype.$go_next = function(controlID) { www/nitrogen.js www/bert.js 9f9354be93b9a7210fa2c350af5f0e0bb17bc671 4bcafe70acd6e51efdf932f4133db3433bde4c67 Rusty Klophaus rklophaus@gmail.com http://github.com/rklophaus/nitrogen/commit/f500d64dcf41e18126e2d211b8f4aae55958b436 f500d64dcf41e18126e2d211b8f4aae55958b436 2009-10-27T16:28:06-07:00 2009-10-27T16:28:06-07:00 Merge branch 'experimental' of git@github.com:rklophaus/nitrogen into experimental Conflicts: Nitrogen.tmproj e34bf8a0c8bc80ba5274e40843d48334936d437e Rusty Klophaus rklophaus@gmail.com