unwrap jse

CHANGELOG.md

@@ -2,12 +2,14 @@
 
 
 
+##### next version
+* unwrap nitro:jse -> nitro:js_escape  
 
 ##### 6.6.1-erl19
-update to 6.6.1 tag by [@5HT Maksym Sokhatskyi/Namdak Tönpa](https://github.com/5HT)  
-with code formatting etc  
+* update to 6.6.1 tag by [@5HT Maksym Sokhatskyi/Namdak Tönpa](https://github.com/5HT)  
+* with code formatting etc  
 
 
 ##### 2.4-erl19
-original [2.4 tag](https://github.com/synrc/nitro/tree/refs/tags/2.4) [[t]](https://github.com/synrc/nitro/tree/3d5247afa7649158ee5a54d51ca5fa88bc0293eb) from [https://github.com/synrc/nitro](https://github.com/synrc/nitro) by [@5HT Maksym Sokhatskyi/Namdak Tönpa](https://github.com/5HT)  
+* original [2.4 tag](https://github.com/synrc/nitro/tree/refs/tags/2.4) [[t]](https://github.com/synrc/nitro/tree/3d5247afa7649158ee5a54d51ca5fa88bc0293eb) from [https://github.com/synrc/nitro](https://github.com/synrc/nitro) by [@5HT Maksym Sokhatskyi/Namdak Tönpa](https://github.com/5HT)  
 

lib/combo.ex

@@ -125,16 +125,16 @@ defmodule NITRO.Combo do
   end
 
   def view_value(obj) when obj in ["", [], :undefined], do: []
-  def view_value(obj), do: :nitro.jse(:erlang.iolist_to_binary(apply(:kvs,:field,[obj, hd(index([]))])))
+  def view_value(obj), do: :nitro.js_escape(:erlang.iolist_to_binary(apply(:kvs,:field,[obj, hd(index([]))])))
 
   def dropDown(obj, dom0, module, feed) do
     view_value = view_value(obj, module, feed)
     dom = :nitro.to_list(dom0)
-    id = :nitro.jse(:erlang.iolist_to_binary(:nitro.atom([dom, :erlang.element(2, obj)])))
+    id = :nitro.js_escape(:erlang.iolist_to_binary(:nitro.atom([dom, :erlang.element(2, obj)])))
     item = :nitro.to_list(item(obj, module))
     source = :erlang.iolist_to_binary(feed)
-    click = :nitro.jse("comboSelect('#{dom}', '#{view_value}', '#{source}', '#{module}', '#{id}')")
-    move = :nitro.jse("comboLookupMouseMove('#{dom}')")
+    click = :nitro.js_escape("comboSelect('#{dom}', '#{view_value}', '#{source}', '#{module}', '#{id}')")
+    move = :nitro.js_escape("comboLookupMouseMove('#{dom}')")
 
     NITRO.panel(
       id: id,

src/elements/combo/element_comboLookup.erl

@@ -21,15 +21,15 @@ render_element( #comboLookup{id = Id, style = Style, value = Val, bind = Object,
            body = [
              #input{id = Id, disabled = Disabled, type = "comboLookup",
                     autocomplete = "off",
-                    onkeyup = nitro:jse("comboLookupKeyup('"
+                    onkeyup = nitro:js_escape("comboLookupKeyup('"
                       ++ nitro:to_list(Id) ++ "','"
                       ++ nitro:to_list(Feed) ++ "','"
                       ++ nitro:to_list(Module) ++ "')"),
-                    onkeydown= nitro:jse("comboLookupKeydown('"
+                    onkeydown= nitro:js_escape("comboLookupKeydown('"
                       ++ nitro:to_list(Id) ++ "','"
                       ++ nitro:to_list(Feed) ++ "','"
                       ++ nitro:to_list(Module) ++ "')"),
-                    onchange= nitro:jse("comboLookupChange('"
+                    onchange= nitro:js_escape("comboLookupChange('"
                       ++ nitro:to_list(Id) ++ "')"),
                     bind = Object,
                     value = Val,
@@ -39,7 +39,7 @@ render_element( #comboLookup{id = Id, style = Style, value = Val, bind = Object,
                     body="▾",
                     onclick = case Disabled of
                       true -> [];
-                      _ -> nitro:jse("comboLookupClick('"
+                      _ -> nitro:js_escape("comboLookupClick('"
                         ++ nitro:to_list(Id) ++ "','"
                         ++ nitro:to_list(Feed) ++ "','"
                         ++ nitro:to_list(Module) ++ "')")

src/elements/combo/element_comboLookupEdit.erl

@@ -30,7 +30,7 @@ render_element( #comboLookupEdit{id = Id, input = Input, disabled = Disabled,
               true ->
                 #link{class = [button, sgreen],
                       style = "min-width: 40px; text-align: center; height: fit-content; margin-left: 5px;",
-                      onclick = nitro:jse("addSortableItemFrom('#" ++ ListId ++ "', '" ++ InputId ++ "')"),
+                      onclick = nitro:js_escape("addSortableItemFrom('#" ++ ListId ++ "', '" ++ InputId ++ "')"),
                       body = <<"+">> };
               false -> []
             end,

src/elements/combo/element_comboLookupVec.erl

@@ -28,7 +28,7 @@ render_element( #comboLookupVec{id = Id, input = Input, disabled = Disabled, val
                   #link{
                     class = [button, sgreen],
                     style = "min-width: 40px; text-align: center; height: fit-content; margin-left: 5px;",
-                    onclick = nitro:jse("addSortableItemFrom('#" ++ ListId ++ "', '" ++ erlang:element(#element.id, Input) ++ "')"),
+                    onclick = nitro:js_escape("addSortableItemFrom('#" ++ ListId ++ "', '" ++ erlang:element(#element.id, Input) ++ "')"),
                     body = <<"+">>}
                  ]
             end

src/elements/combo/element_sortable_item.erl

@@ -32,7 +32,7 @@ render_element( #sortable_item{list_id = ListId, value = Value, bind = Bind, clo
             true -> 
               #panel{
                 class = <<"list__item-close">>,
-                onclick = nitro:jse("removeSortableItem('#" ++ ListId ++ "', this.parentNode);")};
+                onclick = nitro:js_escape("removeSortableItem('#" ++ ListId ++ "', this.parentNode);")};
             _ -> []
           end,
           #panel{

src/nitro.erl

@@ -7,7 +7,7 @@
 
 
 -export([atom/1, q/1, q/2, qc/1, qc/2,
-  jse/1, hte/1, config/3, pickle/1, depickle/1, unique_integer/0, temp_id/0,
+  hte/1, config/3, pickle/1, depickle/1, unique_integer/0, temp_id/0,
   script/0, script/1, actions/0, actions/1, state/1, state/2,
   redirect/1, cookie_expire/1, cookie/2, cookie/3, cookies/0, cookie/1,
   f/1, f/2, coalesce/1,
@@ -33,7 +33,6 @@ q(Key, Def) -> case get(Key) of undefined -> Def; Val -> Val end.
 qc(Key) -> CX = get(context), qc(Key,CX#cx.req).
 qc(Key, Req) -> proplists:get_value(nitro:to_binary(Key),cowboy_req:parse_qs(Req)).
 
-jse(X) -> js_escape(X). %% todo unwrap
 hte(X) when erlang:is_binary(X) -> nitro:to_binary(html_encode(X));
 hte(X) -> html_encode(X).
 config(App, Key, Default) -> application:get_env(App, Key, Default).