Browse Source

comboLookupVec

5HT 5 years ago
parent
commit
d7a4b5bbde

+ 7 - 0
include/comboLookupVec.hrl

@@ -0,0 +1,7 @@
+-ifndef(COMBO_LOOKUP_VEC_HRL).
+-define(COMBO_LOOKUP_VEC_HRL, true).
+
+-include_lib("nitro/include/nitro.hrl").
+-record(comboLookupVec, {?ELEMENT_BASE(element_comboLookupVec), input, disabled, values}).
+
+-endif.

+ 0 - 7
include/input_vec.hrl

@@ -1,7 +0,0 @@
--ifndef(INPUT_VEC_NX_HRL).
--define(INPUT_VEC_NX_HRL, true).
-
--include_lib("nitro/include/nitro.hrl").
--record(input_vec, {?ELEMENT_BASE(element_input_vec), input, disabled, values}).
-
--endif.

+ 1 - 1
mix.exs

@@ -4,7 +4,7 @@ defmodule NITRO.Mixfile do
   def project do
     [
       app: :nitro,
-      version: "5.1.1",
+      version: "5.1.2",
       description: "NITRO Nitrogen Web Framework",
       package: package(),
       deps: deps()

+ 1 - 2
priv/js/nitro.js

@@ -24,7 +24,7 @@ function querySourceRaw(Id) {
                 case 'radio': case 'checkbox': val = qs('input[name='+Id+']:checked'); val = val ? val.value : ""; break;
                 case 'date': val = Date.parse(el.value);  val = val && new Date(val) || ""; break;
                 case 'calendar': val = pickers[el.id]._d || ""; break;
-                case 'text': var x = el.getAttribute('data-bind'); if (x) val=dec(unbase64(x)); break;
+                case 'comboLookup': var x = el.getAttribute('data-bind'); if (x) val=dec(unbase64(x)); break;
                 default: var edit = el.contentEditable;
                     if (edit && edit === 'true') val = el.innerHTML;
                     else val = el.value;
@@ -45,7 +45,6 @@ function querySourceRaw(Id) {
                 }
             }
     }
-    console.log("querySourceRaw:val:", val)
     return val;
 }
 

+ 1 - 1
src/elements/combo/element_comboLookup.erl

@@ -11,7 +11,7 @@ render_element(#comboLookup{id=Id, style=Style, value = Val,
   feed = Feed, disabled = Disabled, delegate = Module} = Data) ->
   nitro:render(
     #panel{id=form:atom([lookup, Id]), class=[dropdown],
-           body=[#input{id=Id, disabled = Disabled, type="text",
+           body=[#input{id=Id, disabled = Disabled, type="comboLookup",
                         onkeyup = nitro:jse("comboLookupKeyup('"
                                ++ nitro:to_list(Id) ++ "','"
                                ++ nitro:to_list(Feed) ++ "','"

+ 3 - 3
src/elements/combo/element_input_vec.erl → src/elements/combo/element_comboLookupVec.erl

@@ -1,11 +1,11 @@
--module(element_input_vec).
--include_lib("nitro/include/input_vec.hrl").
+-module(element_comboLookupVec).
+-include_lib("nitro/include/comboLookupVec.hrl").
 -include_lib("nitro/include/sortable_list.hrl").
 -include_lib("nitro/include/nitro.hrl").
 -include_lib("nitro/include/event.hrl").
 -export([render_element/1]).
 
-render_element(#input_vec{id=Id, input=Input, disabled=Disabled, validation=Validation, values=Values}) ->
+render_element(#comboLookupVec{id=Id, input=Input, disabled=Disabled, validation=Validation, values=Values}) ->
   ListId = form:atom([Id, "list"]),
   InputId = element(#element.id, Input),
   nitro:render(

+ 1 - 1
src/nitro.app.src

@@ -1,6 +1,6 @@
 {application, nitro, [
     {description,  "NITRO Nitrogen Web Framework"},
-    {vsn,          "5.1.1"},
+    {vsn,          "5.1.2"},
     {applications, [kernel, stdlib]},
     {modules, []},
     {registered,   []},