5HT 5 years ago
parent
commit
f7f077da2b

+ 1 - 0
include/comboLookup.hrl

@@ -3,6 +3,7 @@
 
 
 -include_lib("nitro/include/nitro.hrl").
 -include_lib("nitro/include/nitro.hrl").
 
 
+-record(comboKey,  { value=[], dom=[], feed=[], delegate=[]}).
 -record(comboKeyup,  { value=[], dom=[], feed=[], delegate=[]}).
 -record(comboKeyup,  { value=[], dom=[], feed=[], delegate=[]}).
 -record(comboSelect,  { value=[], dom=[], feed=[], delegate=[] }).
 -record(comboSelect,  { value=[], dom=[], feed=[], delegate=[] }).
 -record(comboNext,   { pos=[],  count=[], feed=[]}).
 -record(comboNext,   { pos=[],  count=[], feed=[]}).

+ 1 - 1
include/nitro.hrl

@@ -10,7 +10,7 @@
 -define(ELEMENT_BASE(Module), ?ELEMENT_BASE(Module,[],[])).
 -define(ELEMENT_BASE(Module), ?ELEMENT_BASE(Module,[],[])).
 -define(ELEMENT_BASE(Module,Tag,Delegate),
 -define(ELEMENT_BASE(Module,Tag,Delegate),
         ancestor=element, id=[], module=Module, delegate=Delegate, validation=[],
         ancestor=element, id=[], module=Module, delegate=Delegate, validation=[],
-        validate=[], actions=[], class=[], style=[], source=[], onmouseover=[], onmouseout=[],
+        validate=[], actions=[], class=[], style=[], source=[], onmouseover=[], onmouseout=[], onmousemove=[],
         onkeypress=[], onchange=[], onkeyup=[], onkeydown=[], onclick=[],
         onkeypress=[], onchange=[], onkeyup=[], onkeydown=[], onclick=[],
         data_fields=[], aria_states=[], body=[], role=[], tabindex=[], show_if=true,
         data_fields=[], aria_states=[], body=[], role=[], tabindex=[], show_if=true,
         html_tag=Tag, title=[], postback=[], accesskey=[], contenteditable=[],
         html_tag=Tag, title=[], postback=[], accesskey=[], contenteditable=[],

+ 1 - 1
mix.exs

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

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

@@ -3,7 +3,8 @@
 -include_lib("nitro/include/nitro.hrl").
 -include_lib("nitro/include/nitro.hrl").
 -export([render_element/1,proto/1]).
 -export([render_element/1,proto/1]).
 
 
-proto(#comboKeyup{delegate=Module}=Msg) -> Module:proto(Msg);
+proto(#comboKey{delegate=Module}=Msg)    -> Module:proto(Msg);
+proto(#comboKeyup{delegate=Module}=Msg)  -> Module:proto(Msg);
 proto(#comboSelect{delegate=Module}=Msg) -> Module:proto(Msg).
 proto(#comboSelect{delegate=Module}=Msg) -> Module:proto(Msg).
 
 
 render_element(#comboLookup{id=Id, style=Style, value = Val,
 render_element(#comboLookup{id=Id, style=Style, value = Val,

+ 1 - 1
src/nitro.app.src

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

+ 4 - 4
src/render/wf_render_elements.erl

@@ -15,10 +15,9 @@ render_element(Element) when is_tuple(Element) ->
     case element(#element.validation,Element) of
     case element(#element.validation,Element) of
          [] -> skip;
          [] -> skip;
          Code ->
          Code ->
-         nitro:wire(nitro:f("{var name='~s'; qi(name)"
-           ".addEventListener('validation',"
-              "function(e) { if (!(~s)) e.preventDefault(); });"
-              "qi(name).validation = true;}",[Id,Code])) end,
+         nitro:wire(nitro:f("{var name='~s'; qi(name).addEventListener('validation',"
+                                "function(e) { if (!(~s)) e.preventDefault(); });"
+                                "qi(name).validation = true;}",[Id,Code])) end,
     case element(#element.module,Element) of
     case element(#element.module,Element) of
         [] -> default_render(Tag, Element);
         [] -> default_render(Tag, Element);
         undefined -> default_render(Tag, Element);
         undefined -> default_render(Tag, Element);
@@ -46,6 +45,7 @@ default_render(Tag, Record) ->
             {<<"tabindex">>,        element(#element.tabindex, Record)},
             {<<"tabindex">>,        element(#element.tabindex, Record)},
             {<<"onmouseout">>,      element(#element.onmouseout, Record)},
             {<<"onmouseout">>,      element(#element.onmouseout, Record)},
             {<<"onmouseover">>,     element(#element.onmouseover, Record)},
             {<<"onmouseover">>,     element(#element.onmouseover, Record)},
+            {<<"onmousemove">>,     element(#element.onmousemove, Record)},
             {<<"role">>,            element(#element.role, Record)}],
             {<<"role">>,            element(#element.role, Record)}],
         element(#element.data_fields, Record),
         element(#element.data_fields, Record),
         element(#element.aria_states, Record)])).
         element(#element.aria_states, Record)])).