Quickstart/.gitattributes
Quickstart/src/nbe/backwards_alert.erl
Quickstart/src/nbe/backwards_alert.inc
Quickstart/src/nbe/click_for_message.erl
Quickstart/src/nbe/click_for_message.inc
Quickstart/src/nbe/is_a_z.erl
Quickstart/src/nbe/is_a_z.inc
Quickstart/src/nbe/web_nbe.erl
Quickstart/src/nbe/web_nbe_1_1.erl
Quickstart/src/nbe/web_nbe_1_2.erl
Quickstart/src/nbe/web_nbe_1_3.erl
Quickstart/src/nbe/web_nbe_1_4.erl
Quickstart/src/nbe/web_nbe_1_5.erl
Quickstart/src/nbe/web_nbe_1_6.erl
Quickstart/src/nbe/web_nbe_1_7.erl
Quickstart/src/nbe/web_nbe_1_8.erl
Quickstart/src/nbe/web_nbe_1_9.erl
Quickstart/src/nbe/web_nbe_2_1.erl
Quickstart/src/nbe/web_nbe_2_2.erl
Quickstart/src/nbe/web_nbe_2_3.erl
Quickstart/src/nbe/web_nbe_2_4.erl
Quickstart/src/nbe/web_nbe_2_5.erl
Quickstart/src/nbe/web_nbe_3_1.erl
Quickstart/src/nbe/web_nbe_3_2.erl
Quickstart/src/nbe/web_nbe_3_3.erl
Quickstart/src/nbe/web_nbe_4_1.erl
Quickstart/src/nbe/web_nbe_4_2.erl
Quickstart/src/nbe/web_nbe_4_3.erl
Quickstart/src/nbe/web_nbe_5_1.erl
Quickstart/src/nbe/web_nbe_5_2.erl
Quickstart/src/nbe/web_nbe_5_3.erl
Quickstart/src/nbe/web_nbe_template.erl
Quickstart/wwwroot/css/SyntaxHighlighter.css
Quickstart/wwwroot/css/nbe.css
Quickstart/wwwroot/css/talk.css
Quickstart/wwwroot/flash/clipboard.swf
Quickstart/wwwroot/js/shBrushErlang.js
Quickstart/wwwroot/js/shCore.js
Quickstart/wwwroot/nbe.html
Quickstart/wwwroot/nbe_bindings.html
src/elements/forms/element_label.erl
@@ -1,3 +1,6 @@
+2009-05-02
+- Added changes and bugfixes by Tom McNulty.
+
2009-04-05
- Added a templateroot setting in .app file, courtesy of Ville Koivula.
CHANGELOG
@@ -192,7 +192,7 @@
<key>filename</key>
<string>src/actions/action_jquery_effect.erl</string>
<key>lastUsed</key>
- <date>2009-03-29T12:22:58Z</date>
+ <date>2009-05-03T14:20:47Z</date>
</dict>
<dict>
<key>filename</key>
@@ -489,6 +489,8 @@
<dict>
<key>filename</key>
<string>src/elements/layout/element_windex.erl</string>
+ <key>lastUsed</key>
+ <date>2009-05-03T14:13:19Z</date>
</dict>
</array>
<key>name</key>
@@ -781,7 +783,7 @@
<key>filename</key>
<string>src/lib/wf_tags.erl</string>
<key>lastUsed</key>
- <date>2009-03-29T12:18:24Z</date>
+ <date>2009-05-03T14:39:43Z</date>
</dict>
<dict>
<key>filename</key>
@@ -1360,6 +1362,10 @@
<key>showFileHierarchyDrawer</key>
<true/>
<key>windowFrame</key>
+<<<<<<< HEAD:Nitrogen.tmproj
<string>{{285, 0}, {928, 778}}</string>
+=======
+ <string>{{287, 0}, {928, 778}}</string>
+>>>>>>> 19b6f15aecead6e0cb0d1de9317551bf1ef735ab:Nitrogen.tmproj
</dict>
</plist>
Nitrogen.tmproj
@@ -198,6 +198,6 @@
</dict>
</dict>
<key>windowFrame</key>
- <string>{{204, 0}, {1013, 778}}</string>
+ <string>{{203, 0}, {1002, 778}}</string>
</dict>
</plist>
Quickstart/Quickstart.tmproj
@@ -1,6 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Nitrogen - [[[page:title()]]]</title>
<script src='/nitrogen/jquery.js' type='text/javascript' charset='utf-8'></script>
<script src='/nitrogen/jquery-ui.js' type='text/javascript' charset='utf-8'></script>
Quickstart/wwwroot/onecolumn.html
@@ -1,6 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Nitrogen - [[[page:title()]]]</title>
<script src='/nitrogen/jquery.js' type='text/javascript' charset='utf-8'></script>
<script src='/nitrogen/jquery-ui.js' type='text/javascript' charset='utf-8'></script>
Quickstart/wwwroot/twocolumn.html
@@ -16,6 +16,7 @@ render_action(_TriggerPath, TargetPath, Record) ->
Script = case Record#jquery_effect.type of
'show' when Effect==none -> wf:f("show();");
'hide' when Effect==none -> wf:f("hide();");
+ 'toggle' when Effect==none -> wf:f("toggle();");
'appear' -> wf:f("fadeIn(~p);", [Speed]);
'fade' -> wf:f("fadeOut(~p);", [Speed]);
'show' -> wf:f("show('~s', ~s, ~p);", [Effect, Options, Speed]);
src/actions/action_jquery_effect.erl
@@ -10,18 +10,22 @@ reflect() -> record_info(fields, radiogroup).
render(ControlID, Record) ->
% Set the group to the current ControlID...
-
- F = fun(X) ->
- case is_record(X, radio) of
- true -> X#radio { name=ControlID };
- false -> X
- end
- end,
- Body = [F(X) || X <- Record#radiogroup.body],
+ Body = apply_name(ControlID, Record#radiogroup.body),
% Render the record...
element_panel:render(ControlID, #panel {
class="radiogroup " ++ wf:to_list(Record#radiogroup.class),
style=Record#radiogroup.style,
body=Body
- }).
\ No newline at end of file
+ }).
+
+apply_name(Name, Terms) ->
+ [do_apply(Name, X) || X <- Terms].
+
+do_apply(Name, X) when is_record(X, radio) ->
+ X#radio {name = Name};
+do_apply(Name, X) when is_record(X, bind) ->
+ Body2 = apply_name(Name, X#bind.body),
+ X#bind{body = Body2};
+do_apply(_Name, X) ->
+ X.
src/elements/forms/element_radiogroup.erl
@@ -9,9 +9,9 @@
reflect() -> record_info(fields, h1).
render(ControlID, Record) ->
- Content = Record#h1.text,
+ Content = wf:html_encode(Record#h1.text, Record#h1.html_encode),
wf_tags:emit_tag(h1, Content, [
{id, ControlID},
{class, [h1, Record#h1.class]},
{style, Record#h1.style}
- ]).
\ No newline at end of file
+ ]).
src/elements/heading/element_h1.erl
@@ -9,9 +9,9 @@
reflect() -> record_info(fields, h2).
render(ControlID, Record) ->
- Content = Record#h2.text,
+ Content = wf:html_encode(Record#h2.text, Record#h2.html_encode),
wf_tags:emit_tag(h2, Content, [
{id, ControlID},
{class, [h2, Record#h2.class]},
{style, Record#h2.style}
- ]).
\ No newline at end of file
+ ]).
src/elements/heading/element_h2.erl
@@ -9,9 +9,9 @@
reflect() -> record_info(fields, h3).
render(ControlID, Record) ->
- Content = Record#h3.text,
+ Content = wf:html_encode(Record#h3.text, Record#h3.html_encode),
wf_tags:emit_tag(h3, Content, [
{id, ControlID},
{class, [h3, Record#h3.class]},
{style, Record#h3.style}
- ]).
\ No newline at end of file
+ ]).
src/elements/heading/element_h3.erl
@@ -9,9 +9,9 @@
reflect() -> record_info(fields, h4).
render(ControlID, Record) ->
- Content = Record#h4.text,
+ Content = wf:html_encode(Record#h4.text, Record#h4.html_encode),
wf_tags:emit_tag(h4, Content, [
{id, ControlID},
{class, [h4, Record#h4.class]},
{style, Record#h4.style}
- ]).
\ No newline at end of file
+ ]).
src/elements/heading/element_h4.erl
@@ -8,7 +8,7 @@
reflect() -> record_info(fields, windex).
-render(_ControlID, Record) ->
+render(_ControlID, _Record) ->
% Prevent loops.
case wf:state(template_was_called) of
true -> throw("Calling a template from a template.");
src/elements/layout/element_windex.erl
@@ -15,7 +15,7 @@ render(ControlID, Record) ->
PickledTag
]),
wf:wire(Script),
-
+
element_panel:render(ControlID, #panel {
class="sortitem " ++ wf:to_list(Record#sortitem.class),
style=Record#sortitem.style,
src/elements/other/element_sortitem.erl
@@ -12,13 +12,17 @@
html_encode/1, html_encode/2
]).
+-include ("wf.inc").
%%% CONVERSION %%%
clean_lower(L) -> string:strip(string:to_lower(to_list(L))).
to_list(undefined) -> [];
-to_list(L) when is_list(L) -> inner_to_list(lists:flatten(L));
+to_list(L) when ?IS_STRING(L) -> L;
+to_list(L) when is_list(L) ->
+ SubLists = [inner_to_list(X) || X <- L],
+ lists:flatten(SubLists);
to_list(A) -> inner_to_list(A).
inner_to_list(A) when is_atom(A) -> atom_to_list(A);
inner_to_list(B) when is_binary(B) -> binary_to_list(B);
@@ -52,7 +56,8 @@ html_encode([H|T]) ->
$< -> "<" ++ html_encode(T);
$> -> ">" ++ html_encode(T);
$" -> """ ++ html_encode(T);
+ $' -> "'" ++ html_encode(T);
$& -> "&" ++ html_encode(T);
$\n -> "<br>" ++ html_encode(T);
_ -> [H|html_encode(T)]
- end.
\ No newline at end of file
+ end.
src/lib/wf_convert.erl
@@ -109,7 +109,7 @@ set_header(Key, Value) ->
%%% SOCKETS %%%
get_socket() -> do(get_socket).
-get_peername() -> inet:peername(get_socket).
+get_peername() -> inet:peername(get_socket()).
recv_from_socket(Length, Timeout) -> do(recv_from_socket, [Length, Timeout]).
@@ -170,4 +170,4 @@ build_redirect(Url) ->
end.
build_get_redirect(Url) -> wf:f("<meta http-equiv='refresh' content='0;url=~s' />", [Url]).
-build_post_redirect(Url) -> wf:f("document.location.href=\"~s\";", [wf_utils:js_escape(Url)]).
\ No newline at end of file
+build_post_redirect(Url) -> wf:f("document.location.href=\"~s\";", [wf_utils:js_escape(Url)]).
src/lib/wf_platform.erl
@@ -98,6 +98,7 @@ get_headers() ->
{content_type, F("content-type")},
{content_encoding, F("content-encoding")},
{authorization, F("authorization")},
+ {x_forwarded_for, F("x-forwarded-for")},
{transfer_encoding, F("transfer-encoding")}
].
src/lib/wf_platform_mochiweb.erl
@@ -45,7 +45,8 @@ render(Term) when is_tuple(Term) ->
% Wire actions and render the control.
HtmlID = wf_path:to_html_id(ID),
wf:wire(HtmlID, HtmlID, Base#elementbase.actions),
- lists:flatten([Module:render(HtmlID, Term)]);
+ Terms = Module:render(HtmlID, Term),
+ ensure_rendered(Terms);
{true, false} ->
% Set the new path...
@@ -54,7 +55,8 @@ render(Term) when is_tuple(Term) ->
% Wire actions and render the control.
HtmlID = wf_path:to_html_id(wf_path:get_path()),
wf:wire(HtmlID, HtmlID, Base#elementbase.actions),
- Html = lists:flatten([Module:render(HtmlID, Term)]),
+ Terms = Module:render(HtmlID, Term),
+ Html = ensure_rendered(Terms),
% Restore the old path...
wf_path:pop_path(),
@@ -63,6 +65,14 @@ render(Term) when is_tuple(Term) ->
end,
Response.
+ensure_rendered(Terms) ->
+ % Call render if it has not already been called.
+ case wf:is_string(Terms) of
+ true -> Terms;
+ false -> wf:render(Terms)
+ end.
+
+
%%% RENDER ACTIONS %%%
render_actions(_, _, undefined) -> [];
src/lib/wf_render.erl
@@ -44,7 +44,6 @@ handle_call({sign_key, Unique}, _From, Map) ->
handle_call({get_session, Unique}, _From, Map) ->
{reply, dict:find(Unique, Map), Map}.
-
handle_cast({remove_session, Unique}, Map) ->
{noreply, dict:erase(Unique, Map)};
@@ -60,7 +59,6 @@ terminate(_Reason, _State) ->
code_change(_OldVsn, State, _Extra) ->
{ok, State}.
-
session_monitor(ServerPid, SessionPid, Unique) ->
Ref = erlang:monitor(process, SessionPid),
receive
src/lib/wf_session_server.erl
@@ -43,7 +43,9 @@ state(Key, Value) ->
Value.
clear_state() ->
- put(wf_state, []).
+ put(wf_state, []),
+ wf:state(validators, []).
+
get_state_script() ->
DomState = get(wf_state),
src/lib/wf_state.erl
@@ -27,6 +27,8 @@ emit_tag(TagName, [[], []], Props) ->
emit_tag(TagName, [], Props) when
TagName =/= 'div',
+ TagName =/= 'span',
+ TagName =/= 'label',
TagName =/= 'textarea',
TagName =/= 'iframe' ->
emit_tag(TagName, Props);
@@ -55,12 +57,12 @@ display_property({Prop, V}) when is_atom(Prop) ->
display_property({_, []}) -> "";
display_property({Prop, Value}) when is_integer(Value); is_atom(Value) ->
- [" ", Prop, "='", wf:to_list(Value), "'"];
+ [" ", Prop, "=\"", wf:to_list(Value), "\""];
display_property({Prop, Value}) when is_binary(Value); ?IS_STRING(Value) ->
- [" ", Prop, "='", Value, "'"];
+ [" ", Prop, "=\"", Value, "\""];
display_property({Prop, Values}) ->
StrValues = [wf:to_list(X) || X <- Values],
- [" ", Prop, "='", string:strip(string:join(StrValues, " ")), "'"].
+ [" ", Prop, "=\"", string:strip(string:join(StrValues, " ")), "\""].
src/lib/wf_tags.erl
@@ -186,6 +186,8 @@ quote_plus(Atom) when is_atom(Atom) ->
quote_plus(atom_to_list(Atom));
quote_plus(Int) when is_integer(Int) ->
quote_plus(integer_to_list(Int));
+quote_plus(Bin) when is_binary(Bin) ->
+ quote_plus(binary_to_list(Bin));
quote_plus(String) ->
quote_plus(String, []).
src/lib/wf_utils.erl
@@ -23,7 +23,7 @@ validate(TriggerPath) ->
false ->
false
end
- end,
+ end,
Validators = lists:filter(F1, wf:state(validators)),
src/lib/wf_validation.erl
@@ -130,7 +130,14 @@ get_templateroot() ->
get_sign_key() ->
case get_env(serving_app(), sign_key) of
- {ok, Val} -> Val;
+ {ok, randomized} ->
+ Key = wf_utils:guid(),
+ set_env(serving_app(), sign_key, Key),
+ Key;
+
+ {ok, Val} ->
+ Val;
+
_ -> throw("You must declare a sign_key!")
end.
@@ -162,3 +169,10 @@ get_env(undefined, Key) ->
get_env(App, Key) ->
Value = application:get_env(App, Key),
Value.
+
+set_env(undefined, Key, Val) ->
+ {ok, App} = application:get_application(),
+ ok = application:set_env(App, Key, Val);
+
+set_env(App, Key, Val) ->
+ ok = application:set_env(App, Key, Val).
src/nitrogen.erl
@@ -37,7 +37,7 @@ basic_test_() ->
new_jquery_effect_1('fade')),
?_assertEqual("Nitrogen.$current_id='';Nitrogen.$current_path='';jQuery(obj('_target_path')).effect('none', { Key1: 'Value1',Key2: 'Value2' }, \"a_speed\");",
new_jquery_effect_1('effect')),
- ?_assertEqual("Nitrogen.$current_id='';Nitrogen.$current_path='';jQuery(obj('_target_path')).toggle('none', { Key1: 'Value1',Key2: 'Value2' }, \"a_speed\");",
+ ?_assertEqual("Nitrogen.$current_id='';Nitrogen.$current_path='';jQuery(obj('_target_path')).toggle();",
new_jquery_effect_1('toggle')),
?_assertEqual("Nitrogen.$current_id='';Nitrogen.$current_path='';jQuery(obj('_target_path')).addClass('a_class', \"a_speed\");",
new_jquery_effect_1('add_class')),
test/src/actions/action_jquery_effect_test.erl
@@ -18,9 +18,9 @@ new_textarea_3() ->
lists:flatten(element_textarea:render("3",Rec_textarea)).
basic_test_() ->
- [?_assertEqual("<textarea id='1' name='1' class='textarea'></textarea>",new_textarea_1()),
- ?_assertEqual("<textarea id='2' name='2' class='textarea t_textarea'></textarea>",new_textarea_2()),
- ?_assertEqual("<textarea id='3' name='3' class='textarea t_textarea' style='color: cyan;'>TEXT</textarea>",new_textarea_3()),
+ [?_assertEqual("<textarea id=\"1\" name=\"1\" class=\"textarea\"></textarea>",new_textarea_1()),
+ ?_assertEqual("<textarea id=\"2\" name=\"2\" class=\"textarea t_textarea\"></textarea>",new_textarea_2()),
+ ?_assertEqual("<textarea id=\"3\" name=\"3\" class=\"textarea t_textarea\" style=\"color: cyan;\">TEXT</textarea>",new_textarea_3()),
?_assertEqual([module,id,actions,show_if,class,style,text,html_encode],
element_textarea:reflect())
].
test/src/elements/forms/element_textarea_test.erl
@@ -20,9 +20,9 @@ new_br_with_style() ->
lists:flatten(element_br:render("3",Rec_br)).
basic_test_() ->
- [?_assertEqual("<br id='1' class='br'/>",new_br_1()),
- ?_assertEqual("<br id='2' class='br t_br'/>",new_br_2()),
- ?_assertEqual("<br id='3' class='br t_br' style='color: cyan;'/>",new_br_with_style()),
+ [?_assertEqual("<br id=\"1\" class=\"br\"/>",new_br_1()),
+ ?_assertEqual("<br id=\"2\" class=\"br t_br\"/>",new_br_2()),
+ ?_assertEqual("<br id=\"3\" class=\"br t_br\" style=\"color: cyan;\"/>",new_br_with_style()),
?_assertEqual([module,id,actions,show_if,class,style],
element_br:reflect())
].
test/src/elements/html/element_br_test.erl
@@ -20,9 +20,9 @@ new_hr_3() ->
lists:flatten(element_hr:render("3",Rec_hr)).
basic_test_() ->
- [?_assertEqual("<hr size='1' id='1' class='hr'/>",new_hr_1()),
- ?_assertEqual("<hr size='1' id='2' class='hr t_hr'/>",new_hr_2()),
- ?_assertEqual("<hr size='1' id='3' class='hr t_hr' style='color: cyan;'/>",new_hr_3()),
+ [?_assertEqual("<hr size=\"1\" id=\"1\" class=\"hr\"/>",new_hr_1()),
+ ?_assertEqual("<hr size=\"1\" id=\"2\" class=\"hr t_hr\"/>",new_hr_2()),
+ ?_assertEqual("<hr size=\"1\" id=\"3\" class=\"hr t_hr\" style=\"color: cyan;\"/>",new_hr_3()),
?_assertEqual([module,id,actions,show_if,class,style],
element_hr:reflect())
].
test/src/elements/html/element_hr_test.erl
@@ -20,9 +20,9 @@ new_image_3() ->
lists:flatten(element_image:render("3",Rec_image)).
basic_test_() ->
- [?_assertEqual("<img id='1' class='image'/>",new_image_1()),
- ?_assertEqual("<img id='2' class='image t_image'/>",new_image_2()),
- ?_assertEqual("<img id='3' class='image t_image' style='color: cyan;' src='http://an_image.com/sample/image.jpg'/>",new_image_3()),
+ [?_assertEqual("<img id=\"1\" class=\"image\"/>",new_image_1()),
+ ?_assertEqual("<img id=\"2\" class=\"image t_image\"/>",new_image_2()),
+ ?_assertEqual("<img id=\"3\" class=\"image t_image\" style=\"color: cyan;\" src=\"http://an_image.com/sample/image.jpg\"/>",new_image_3()),
?_assertEqual([module,id,actions,show_if,class,style,image,alt],
element_image:reflect())
].
test/src/elements/html/element_image_test.erl
@@ -20,9 +20,9 @@ new_label_3() ->
lists:flatten(element_label:render("3",Rec_label)).
basic_test_() ->
- [?_assertEqual("<span id='1' class='label'/>",new_label_1()),
- ?_assertEqual("<span id='2' class='label t_label'/>",new_label_2()),
- ?_assertEqual("<span id='3' class='label t_label' style='color: cyan;'>Username:</span>",new_label_3()),
+ [?_assertEqual("<label id=\"1\" class=\"label\"></label>",new_label_1()),
+ ?_assertEqual("<label id=\"2\" class=\"label t_label\"></label>",new_label_2()),
+ ?_assertEqual("<label id=\"3\" class=\"label t_label\" style=\"color: cyan;\">Username:</label>",new_label_3()),
?_assertEqual([module,id,actions,show_if,class,style,text,html_encode],
element_label:reflect())
].
test/src/elements/html/element_label_test.erl
@@ -28,12 +28,12 @@ new_link_5() ->
lists:flatten(element_link:render("5",Rec_link)).
basic_test_() ->
- [?_assertEqual("<a id='1' href='javascript:' class='link'/>", new_link_1()),
- ?_assertEqual("<a id='2' href='javascript:' class='link'/>", new_link_2()),
- ?_assertEqual("<a id='3' href='javascript:' class='link'/>", new_link_3()),
- ?_assert(eunit_helper:regexpMatch("<a id='4' href='javascript:' class='link'><img id='.*?' class='image' src='/path/to/image.gif'/></a>",
+ [?_assertEqual("<a id=\"1\" href=\"javascript:\" class=\"link\"/>", new_link_1()),
+ ?_assertEqual("<a id=\"2\" href=\"javascript:\" class=\"link\"/>", new_link_2()),
+ ?_assertEqual("<a id=\"3\" href=\"javascript:\" class=\"link\"/>", new_link_3()),
+ ?_assert(eunit_helper:regexpMatch("<a id=\"4\" href=\"javascript:\" class=\"link\"><img id=\".*?\" class=\"image\" src=\"/path/to/image.gif\"/></a>",
new_link_4())),
- ?_assertEqual("<a id='5' href='not_javascript' class='link'>LINK TEXTA LINK BODY</a>", new_link_5()),
+ ?_assertEqual("<a id=\"5\" href=\"not_javascript\" class=\"link\">LINK TEXTA LINK BODY</a>", new_link_5()),
?_assertEqual([module,id,actions,show_if,class,style,text,body, html_encode,url,postback],
element_link:reflect())
].
test/src/elements/html/element_link_test.erl
@@ -33,12 +33,12 @@ new_list_6() ->
basic_test_() ->
[
- ?_assertEqual("<ul id='1' class='list'/>",new_list_1()),
- ?_assertEqual("<ul id='2' class='list t_list'/>",new_list_2()),
- ?_assertEqual("<ul id='3' class='list t_list' style='color: cyan;'>SOME BODY</ul>",new_list_3()),
- ?_assertEqual("<ol id='4' class='list'/>",new_list_4()),
- ?_assertEqual("<ol id='5' class='list t_list'/>",new_list_5()),
- ?_assertEqual("<ol id='6' class='list t_list' style='color: cyan;'>SOME BODY</ol>",new_list_6()),
+ ?_assertEqual("<ul id=\"1\" class=\"list\"/>",new_list_1()),
+ ?_assertEqual("<ul id=\"2\" class=\"list t_list\"/>",new_list_2()),
+ ?_assertEqual("<ul id=\"3\" class=\"list t_list\" style=\"color: cyan;\">SOME BODY</ul>",new_list_3()),
+ ?_assertEqual("<ol id=\"4\" class=\"list\"/>",new_list_4()),
+ ?_assertEqual("<ol id=\"5\" class=\"list t_list\"/>",new_list_5()),
+ ?_assertEqual("<ol id=\"6\" class=\"list t_list\" style=\"color: cyan;\">SOME BODY</ol>",new_list_6()),
?_assertEqual([module,id,actions,show_if,class,style,numbered,body],
element_list:reflect())
].
test/src/elements/html/element_list_test.erl
@@ -20,9 +20,9 @@ new_listitem_3() ->
lists:flatten(element_listitem:render("3",Rec_listitem)).
basic_test_() ->
- [?_assertEqual("<li id='1' class='listitem'/>",new_listitem_1()),
- ?_assertEqual("<li id='2' class='listitem t_listitem'/>",new_listitem_2()),
- ?_assertEqual("<li id='3' class='listitem t_listitem' style='color: cyan;'>http://an_listitem.com/sample/listitem.jpg</li>",new_listitem_3()),
+ [?_assertEqual("<li id=\"1\" class=\"listitem\"/>",new_listitem_1()),
+ ?_assertEqual("<li id=\"2\" class=\"listitem t_listitem\"/>",new_listitem_2()),
+ ?_assertEqual("<li id=\"3\" class=\"listitem t_listitem\" style=\"color: cyan;\">http://an_listitem.com/sample/listitem.jpg</li>",new_listitem_3()),
?_assertEqual([module,id,actions,show_if,class,style,body,text,html_encode],
element_listitem:reflect())
].
test/src/elements/html/element_listitem_test.erl
@@ -20,9 +20,9 @@ new_p_3() ->
lists:flatten(element_p:render("3",Rec_p)).
basic_test_() ->
- [?_assertEqual("<p id='1' class='p'/>",new_p_1()),
- ?_assertEqual("<p id='2' class='p t_p'/>",new_p_2()),
- ?_assertEqual("<p id='3' class='p t_p' style='color: cyan;'/>",new_p_3()),
+ [?_assertEqual("<p id=\"1\" class=\"p\"/>",new_p_1()),
+ ?_assertEqual("<p id=\"2\" class=\"p t_p\"/>",new_p_2()),
+ ?_assertEqual("<p id=\"3\" class=\"p t_p\" style=\"color: cyan;\"/>",new_p_3()),
?_assertEqual([module,id,actions,show_if,class,style,body],
element_p:reflect())
].
test/src/elements/html/element_p_test.erl
@@ -20,9 +20,9 @@ new_span_3() ->
lists:flatten(element_span:render("3",Rec_span)).
basic_test_() ->
- [?_assertEqual("<span id='1'/>",new_span_1()),
- ?_assertEqual("<span id='2' class='t_span'/>",new_span_2()),
- ?_assertEqual("<span id='3' class='t_span' style='color: cyan;'>Some Text</span>", new_span_3()),
+ [?_assertEqual("<span id=\"1\"></span>",new_span_1()),
+ ?_assertEqual("<span id=\"2\" class=\"t_span\"></span>",new_span_2()),
+ ?_assertEqual("<span id=\"3\" class=\"t_span\" style=\"color: cyan;\">Some Text</span>", new_span_3()),
?_assertEqual([module,id,actions,show_if,class,style,text, html_encode],
element_span:reflect())
].
test/src/elements/html/element_span_test.erl
@@ -20,9 +20,9 @@ new_value_3() ->
lists:flatten(element_value:render("3",Rec_value)).
basic_test_() ->
- [?_assertEqual("<span id='1' class='value'/>",new_value_1()),
- ?_assertEqual("<span id='2' class='value t_value'/>",new_value_2()),
- ?_assertEqual("<span id='3' class='value t_value' style='color: cyan;'>TEXT</span>",new_value_3()),
+ [?_assertEqual("<span id=\"1\" class=\"value\"></span>",new_value_1()),
+ ?_assertEqual("<span id=\"2\" class=\"value t_value\"></span>",new_value_2()),
+ ?_assertEqual("<span id=\"3\" class=\"value t_value\" style=\"color: cyan;\">TEXT</span>",new_value_3()),
?_assertEqual([module,id,actions,show_if,class,style,text,html_encode],
element_value:reflect())
].
test/src/elements/html/element_value_test.erl
@@ -131,6 +131,7 @@ N.prototype.$validate_and_serialize = function(triggerID) {
var s = "";
var is_valid = true;
var elements = this.$get_elements_to_serialize();
+
for (var i=0; i<elements.length; i++) {
element = elements[i];
if (element.validator && (element.validator.trigger.id == triggerID) && !element.validator.validate()) {
@@ -253,6 +254,7 @@ 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.action = n.$url;
form.submit();
form.reset();
}
@@ -439,6 +441,7 @@ N.$droppable = function(dropObj, dropOptions, dropPostbackInfo) {
N.$sortitem = function(sortItem, sortTag) {
sortItem.$sort_tag = sortTag;
+ sortItem.$drag_tag = sortTag;
}
N.$sortblock = function(sortBlock, sortOptions, sortPostbackInfo) {
www/nitrogen.js
src/elements/html/element_label.erl
e6116382661529ffd2792e57133004e758fb6178
19b6f15aecead6e0cb0d1de9317551bf1ef735ab
Rusty Klophaus
rklophaus@gmail.com
http://github.com/rklophaus/nitrogen/commit/c74522dcd3821e5d201bad7a82c9b7acdf1674eb
c74522dcd3821e5d201bad7a82c9b7acdf1674eb
2009-10-02T04:29:09-07:00
2009-10-02T04:29:09-07:00
Merge branch 'master' of git@github.com:rklophaus/nitrogen
Conflicts:
Nitrogen.tmproj
e3e2728f83c48035f7eaddc87bab4aecc255d387
Rusty Klophaus
rklophaus@gmail.com