wip

Author: 5HT

lib/combo.ex

@@ -104,7 +104,7 @@ defmodule NITRO.Combo do
   def comboInsert(NITRO.comboInsert(chunks: 0, dom: field, status: :finished)) do
     :nitro.wire("activeCombo = undefined; currentItem = undefined;")
     :nitro.hide(:nitro.atom([:comboContainer, :nitro.to_list(field)]))
-    :nitro.wire("comboOpenFormById('#{:nitro.atom([:nitro.to_list(field), 'form'])}');")
+    :nitro.wire("comboOpenFormById('#{:nitro.atom([:nitro.to_list(field), ~c"form"])}');")
   end
 
   def comboInsert(NITRO.comboInsert(uid: uid, dom: field, rows: rows, delegate: module, feed: feed)) do
@@ -200,7 +200,7 @@ defmodule NITRO.Combo do
 
     NITRO.panel(
       id: id,
-      class: ['dropdown-item'],
+      class: [~c"dropdown-item"],
       bind: :base64.encode(:erlang.term_to_binary(obj)),
       onclick: click,
       onmousemove: move,

lib/comboFeeds.ex

@@ -57,7 +57,7 @@ defmodule NITRO.Combo.Feeds do
     comboContainer = :nitro.atom([:comboContainer, :nitro.to_list(field)])
     :nitro.display(:nitro.atom([:comboContainer, field]), :block)
     :nitro.clear(comboContainer)
-    :nitro.wire("comboCloseFormById('#{:nitro.atom([:nitro.to_list(field), 'form'])}');")
+    :nitro.wire("comboCloseFormById('#{:nitro.atom([:nitro.to_list(field), ~c"form"])}');")
     :nitro.wire("comboLookupChange('#{field}');")
     :nitro.wire(NITRO.bind(target: :nitro.to_binary(comboContainer), type: :scroll, postback: onscroll(uid, field, module)))
     send(self(), {:direct, NITRO.comboLoader(dom: field, delegate: module, status: :finished)})

lib/comboSearch.ex

@@ -51,7 +51,7 @@ defmodule NITRO.Combo.Search do
     comboContainer = :nitro.atom([:comboContainer, :nitro.to_list(field)])
     :nitro.display(:nitro.atom([:comboContainer, field]), :block)
     :nitro.clear(comboContainer)
-    :nitro.wire("comboCloseFormById('#{:nitro.atom([:nitro.to_list(field), 'form'])}');")
+    :nitro.wire("comboCloseFormById('#{:nitro.atom([:nitro.to_list(field), ~c"form"])}');")
     :nitro.wire("comboLookupChange('#{field}');")
     :nitro.wire(NITRO.bind(target: :nitro.to_binary(comboContainer), type: :scroll, postback: onscroll(uid, field, module)))
     send(self(), {:direct, NITRO.comboLoader(dom: field, delegate: module, status: :finished)})

mix.exs

@@ -4,10 +4,11 @@ defmodule NITRO.Mixfile do
   def project do
     [
       app: :nitro,
-      version: "9.9.6",
+      version: "9.9.7",
       description: "NITRO Nitrogen Web Framework",
       package: package(),
-      deps: deps()
+      deps: deps(),
+      erlc_options: [:nowarn_export_all, :nowarn_deprecated_function]
     ]
   end
 

src/elements/combo/element_calendar.erl

@@ -51,9 +51,9 @@ render_element(Record) ->
     ],
     wf_tags:emit_tag(<<"input">>, nitro:render(Record#calendar.body), List).
 
-init(Id,#calendar{minDate=Min,maxDate=Max,lang=Lang,format=Form,
-        value=Value,onSelect=SelectFn,disableDayFn=DisDayFn,firstDay=FirstDay,
-        position=Pos,reposition=Repos,yearRange=YearRange} = Calendar) ->
+init(Id,#calendar{minDate=Min,maxDate=Max,lang=_Lang,format=Form,
+        value=Value,onSelect=_SelectFn,disableDayFn=_DisDayFn,firstDay=FirstDay,
+        position=_Pos,reposition=_Repos,yearRange=YearRange} = _Calendar) ->
     ID = nitro:to_list(Id),
     I18n =        "clLangs.ua",
     DefaultDate = case Value of

src/elements/combo/element_comboLookup.erl

@@ -16,7 +16,7 @@ proto(#comboDraft{delegate=Module}=Msg)  -> Module:proto(Msg);
 proto(#comboLoader{delegate=Module}=Msg) -> Module:proto(Msg).
 
 render_element(#comboLookup{id=Id, style=Style, value = Val, bind = Object,
-  feed = Feed, disabled = Disabled, delegate = Module, class = Class, nested = Nested, update = Update} = Data) ->
+  feed = Feed, disabled = Disabled, delegate = Module, class = Class, nested = Nested, update = Update} = _Data) ->
   Uid = nitro_pi:uid([], []),
   DataNested = case Nested of [] -> []; _ -> [{<<"nested">>, Nested}] end,
   DataBind = case Object of [] -> []; _ -> [{<<"data-bind">>, base64:encode(term_to_binary(Object))}] end,

src/elements/combo/element_comboLookupText.erl

@@ -3,8 +3,7 @@
 -include_lib("nitro/include/nitro.hrl").
 -export([render_element/1]).
 
-render_element(#comboLookupText{id=Id, input=Input, disabled=Disabled, validation=Validation, textarea=Textarea, values=Values}) ->
-  InputId = element(#element.id, Input),
+render_element(#comboLookupText{id=Id, input=Input, disabled=Disabled, validation=Validation, textarea=Textarea, values=_Values}) ->
   LookupId = "wrap_" ++ Id ++ "_lookup",
   TextareaId = "wrap_" ++ Id ++ "_textarea",
   WrapId = "wrap_" ++ Id ++ "_comboLookupText",

src/elements/combo/element_comboLookupVec.erl

@@ -7,7 +7,6 @@
 
 render_element(#comboLookupVec{id=Id, input=Input, disabled=Disabled, validation=Validation, values=Values}) ->
   ListId = nitro:atom([Id, "list"]),
-  InputId = element(#element.id, Input),
   nitro:render(
     #panel{
       id = Id,

src/elements/combo/element_koatuu.erl

@@ -5,7 +5,7 @@
 -include_lib("nitro/include/event.hrl").
 -export([render_element/1]).
 
-render_element(#koatuu{id=Id, style=Style, postback = Postback,delegate = Module} = Data) ->
+render_element(#koatuu{id=Id, postback = Postback}) ->
   Options = [ #option{ value = <<"Хмельницька"/utf8>>,
                        body = <<"Хмельницька"/utf8>>,
                       selected = true}], % 25 regions from const feed

src/elements/form/element_select.erl

@@ -43,10 +43,10 @@ render_element(O = #option{}) ->
 
 get_attrs(O) ->
   ValueAttr = case {O#option.selected, O#option.disabled} of
-                {true, _} -> <<"selected value">>;
                 {true, true} -> <<"selected disabled value">>;
-                {_, true} -> <<"disabled value">>;
-                _ -> <<"value">>
+                {true, false} -> <<"selected value">>;
+                {false, true} -> <<"disabled value">>;
+                {false, false} -> <<"value">>
               end,
   [{<<"id">>, O#option.id},
     {<<"label">>, O#option.label},