Browse Source

changed validation 4 postbacks elements, added validate field

G-Grand 9 years ago
parent
commit
ffce75c473
3 changed files with 4 additions and 4 deletions
  1. 2 2
      include/nitro.hrl
  2. 1 1
      src/elements/element_link.erl
  3. 1 1
      src/render/wf_render_elements.erl

+ 2 - 2
include/nitro.hrl

@@ -5,9 +5,9 @@
 -define(DEFAULT_BASE_TAG(Tag), {?ELEMENT_BASE(undefined,Tag,undefined)}).
 -define(DEFAULT_BASE_TAG(Tag), {?ELEMENT_BASE(undefined,Tag,undefined)}).
 -define(ELEMENT_BASE(Module), ?ELEMENT_BASE(Module,undefined,undefined)).
 -define(ELEMENT_BASE(Module), ?ELEMENT_BASE(Module,undefined,undefined)).
 -define(ELEMENT_BASE(Module,Tag,Delegate),
 -define(ELEMENT_BASE(Module,Tag,Delegate),
-        ancestor=element, id, module=Module, delegate=Delegate, validation=[], actions, class=[], style=[], source=[], onmouseover, onkeypress, onchange, onkeyup, onkeydown, onclick,
+        ancestor=element, id, module=Module, delegate=Delegate, validation=[], validate=[], actions, class=[], style=[], source=[], onmouseover, onkeypress, onchange, onkeyup, onkeydown, onclick,
         data_fields=[], aria_states=[], body, role, tabindex, show_if=true, html_tag=Tag, title, postback=[], accesskey, contenteditable, contextmenu, dir, draggable, dropzone,
         data_fields=[], aria_states=[], body, role, tabindex, show_if=true, html_tag=Tag, title, postback=[], accesskey, contenteditable, contextmenu, dir, draggable, dropzone,
-        hidden, lang, spellcheck, translate, onafterprint, onbeforeprint, onbeforeunload, onblur, onerror, onfocus, onhashchange, onload, onmessage, onoffline, ononline, onpagehide, onpageshow, onpopstate, onresize, onstorage, onunload).
+        hidden, lang, spellcheck, translate, onblur, onerror, onfocus, onmessage, onresize).
 -define(ACTION_BASE(Module), ancestor=action, trigger, target, module=Module, actions, source=[]).
 -define(ACTION_BASE(Module), ancestor=action, trigger, target, module=Module, actions, source=[]).
 -define(CTRL_BASE(Module), ?ELEMENT_BASE(Module,undefined,Module)).
 -define(CTRL_BASE(Module), ?ELEMENT_BASE(Module,undefined,Module)).
 
 

+ 1 - 1
src/elements/element_link.erl

@@ -9,7 +9,7 @@ render_element(Record) ->
         Postback ->
         Postback ->
             ID = case Record#link.id of undefined -> nitro:temp_id(); I -> I end,
             ID = case Record#link.id of undefined -> nitro:temp_id(); I -> I end,
             nitro:wire(#event{ type=click,postback=Postback,target=ID,
             nitro:wire(#event{ type=click,postback=Postback,target=ID,
-                            source=Record#link.source,delegate=Record#link.delegate,validation=Record#link.validation}),
+                            source=Record#link.source,delegate=Record#link.delegate,validation=Record#link.validate}),
             ID end,
             ID end,
     List = [
     List = [
       % global
       % global

+ 1 - 1
src/render/wf_render_elements.erl

@@ -13,7 +13,7 @@ render_element(Element) when is_tuple(Element) ->
     Tag = case element(#element.html_tag,Element) of undefined -> nitro:to_binary(element(1, Element)); T -> T end,
     Tag = case element(#element.html_tag,Element) of undefined -> nitro:to_binary(element(1, Element)); T -> T end,
     case element(#element.validation,Element) of
     case element(#element.validation,Element) of
          [] -> skip;
          [] -> skip;
-         Code when element(#element.postback,Element) == [] ->
+         Code ->
          nitro:wire(nitro:f("{var name='~s'; qi(name)"
          nitro:wire(nitro:f("{var name='~s'; qi(name)"
            ".addEventListener('validation',"
            ".addEventListener('validation',"
               "function(e) { if (!(~s)) e.preventDefault(); });"
               "function(e) { if (!(~s)) e.preventDefault(); });"