#prompt{basic=true} is working. Now to add basic=false

Author: choptastic

include/wf.hrl

@@ -1064,12 +1064,6 @@
 -record(alert, {?ACTION_BASE(action_alert),
         text=""                 :: text()
     }).
--record(confirm, {?ACTION_BASE(action_confirm),
-        text=""                 :: text(),
-        postback                :: term(),
-        vessel                  :: id() | text(),
-        delegate                :: module()
-    }).
 -record(modal, {?ACTION_BASE(action_modal),
         id                      :: undefined | id(),
         text=""                 :: text() | undefined,
@@ -1079,13 +1073,32 @@
         buttons=[]              :: body() | undefined |
                                     [#button{} |
                                      {text(), Postback :: any()} |
-                                     {text(), Delegate :: module(), Postback :: any()}],
+                                     {text(), Postback :: any(), Delegate :: module()}],
 
         close_text              :: text() | undefined,
         close_body              :: body() | undefined,
         show_close_button=true  :: boolean(),
         options=[]              :: term()
     }).
+%% create #confirm{} from #modal{}
+?WF_EXTEND(modal, confirm, action_confirm, [
+        {postback,  undefined, "term()"},
+        {vessel,    undefined, "id() | text()"},
+        {delegate,  undefined, "module()"},
+        {basic,     false,      "boolean()"}
+]).
+
+%% Create #prompt{} from #modal{}
+?WF_EXTEND(modal, prompt, action_prompt, [
+        %% `tag` used instead of `postback` because `postback` implies a call to
+        %% event/1, while `tag` implies a call to a different function
+        {tag,       undefined,  "term()"},
+        {vessel,    undefined,  "id() | text()"},
+        {delegate,  undefined,  "module()"},
+        {basic,     false,      "boolean()"},
+        {fields,    [],         "list()"},
+        {default,   "",         "text()"}
+]).
 -record(close_modal, {?ACTION_BASE(action_modal),
         id                      :: undefined | id(),
         options=[]              :: term()

priv/www/nitrogen.js

@@ -2038,7 +2038,6 @@ var page = document;
 
 var Nitrogen = new NitrogenClass();
 
-
 window.addEventListener('beforeunload', function() {
     // Give a "redirect prompt" if presented to prevent such.
     if(!Nitrogen.$allow_redirect) {

src/actions/action_confirm.erl

@@ -6,8 +6,11 @@
 -module(action_confirm).
 -include("wf.hrl").
 -export([render_action/1]).
+-export([reflect/0]).
 
-render_action(Record) -> 
+reflect() -> record_info(fields, confirm).
+
+render_action(Record = #confirm{basic=true}) -> 
     TriggerPath = Record#confirm.trigger,
     TargetPath = Record#confirm.target,
     Delegate = Record#confirm.delegate,
@@ -22,5 +25,33 @@ render_action(Record) ->
         },
         Record#confirm.actions,
         "}"
-    ].
+    ];
+render_action(Confirm = #confirm{basic=false}) ->
+    OKButtonList = make_ok_button_list(Confirm),
+    Confirm2 = maybe_set_close_text(Confirm),
+    Modal = wf_utils:copy_fields(Confirm2, #modal{}),
+    Buttons = Modal#modal.buttons ++ OKButtonList,
+    Modal2 = Modal#modal{buttons=Buttons},
+    Modal2.
+
+maybe_set_close_text(C = #confirm{close_text=T, close_body=B})
+        when ?WF_BLANK(T) andalso ?WF_BLANK(B) ->
+    %% if the close button info isn't specified, override #modal's default of
+    %% "Close" with "Cancel" (to more accurately match the way javascript's
+    %% confirm() does it)"
+    C#confirm{close_text="Cancel"};
+maybe_set_close_text(C) ->
+    C.
 
+make_ok_button_list(#confirm{postback=Postback, vessel=Vessel, delegate=Delegate, actions=Actions}) when not(?WF_BLANK(Postback)) ->
+    [#button{
+        text="OK",
+        postback=Postback,
+        vessel=Vessel,
+        delegate=Delegate,
+        %trigger=TriggerPath,
+        %target=TargetPath,
+        click=[Actions,#close_modal{}]
+    }];
+make_ok_button_list(_) ->
+    [].

src/actions/action_modal.erl

@@ -7,6 +7,9 @@
 -include("wf.hrl").
 -export([render_action/1]).
 
+-export([reflect/0]).
+reflect() -> record_info(fields, modal).
+
 render_action(Rec = #modal{}) ->
     modal_handler:render_open_action(Rec);
 render_action(Rec = #close_modal{}) ->

src/handlers/modal/default_modal_handler.erl

@@ -77,7 +77,7 @@ process_buttons([X | Rest]) when ?WF_BLANK(X) ->
     process_buttons(Rest);
 process_buttons([{Text, Postback} | Rest]) ->
     [#button{text=Text, postback=Postback} | process_buttons(Rest)];
-process_buttons([{Text, Delegate, Postback} | Rest]) ->
+process_buttons([{Text, Postback, Delegate} | Rest]) ->
     [#button{text=Text, postback=Postback, delegate=Delegate} | process_buttons(Rest)];
 process_buttons([Button | Rest]) when ?IS_ELEMENT(Button) ->
     [Button | process_buttons(Rest)];

src/lib/wf_event.erl

@@ -78,7 +78,7 @@ generate_postback_script(Postback, Vessel, Anchor, ValidationGroup, HandleInvali
     [
         wf:f("Nitrogen.$queue_event(~s, '~s', ", [VesselSelector, ValidationGroup]),
         OnInvalidScript,
-        wf:f(", '~s', ~s);", [PickledPostbackInfo, ExtraParam])
+        wf:f(", '~s', ~ts);", [PickledPostbackInfo, ExtraParam])
     ].