cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/form/validator NumberValidator.js

[hlship]

hlship      2005/08/19 06:58:39

  Modified:    .        status.xml
               framework/src/java/org/apache/tapestry/form/translator
                        NumberTranslator.js
               framework/src/java/org/apache/tapestry/form/validator
                        NumberValidator.js
  Log:
  TAPESTRY-570: Number translator generates incorrect javascript, preventing 
validation that the input value is numeric
  
  Revision  Changes    Path
  1.220     +1 -0      jakarta-tapestry/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/status.xml,v
  retrieving revision 1.219
  retrieving revision 1.220
  diff -u -r1.219 -r1.220
  --- status.xml        19 Aug 2005 13:28:16 -0000      1.219
  +++ status.xml        19 Aug 2005 13:58:38 -0000      1.220
  @@ -107,6 +107,7 @@
         <action type="fix" dev="HLS" fixes-bug="TAPESTRY-541" due-to="Markus 
Wiederkehr">Add a configuration point for creating additional 
SqueezeAdaptors</action>
         <action type="update" dev="HLS">Change SerializableAdaptor to encode 
with and without compression, and use the shorter of the two</action>
         <action type="fix" dev="HLS" fixes-bug="TAPESTRY-543">DateField.jwc is 
4.0 DTD but uses the type attribute of &lt;parameter&gt;</action>
  +      <action type="fix" dev="HLS" fixes-bug="TAPESTRY-570">Number 
translator generates incorrect javascript, preventing validation that the input 
value is numeric</action>
       </release>
       <release version="4.0-beta-3" date="Jul 22 2005">
         <action type="fix" dev="HLS" fixes-bug="TAPESTRY-398" due-to="Jonas 
Maurus">HiveMind configuration error breaks the useage of the state: binding 
prefix</action>
  
  
  
  1.4       +1 -1      
jakarta-tapestry/framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.js
  
  Index: NumberTranslator.js
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.js,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NumberTranslator.js       19 Aug 2005 13:28:16 -0000      1.3
  +++ NumberTranslator.js       19 Aug 2005 13:58:38 -0000      1.4
  @@ -17,5 +17,5 @@
        if (field.value == "") return;
        
        if (isNaN(field.value))
  -        event.invalid_field(field, message)    
  +             event.invalid_field(field, message)    
   }
  
  
  
  1.5       +8 -4      
jakarta-tapestry/framework/src/java/org/apache/tapestry/form/validator/NumberValidator.js
  
  Index: NumberValidator.js
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/validator/NumberValidator.js,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NumberValidator.js        19 Aug 2005 13:28:16 -0000      1.4
  +++ NumberValidator.js        19 Aug 2005 13:58:39 -0000      1.5
  @@ -14,16 +14,20 @@
   
   Tapestry.validate_min_number = function(event, field, min, message)
   {
  -     var num = eval(field.value)
  +     var value = field.value;
        
  -    if (num < min)
  +     if (value == "") return;
  +     
  +    if (Number(value) < min)
         event.invalid_field(field, message)
   }
   
   Tapestry.validate_max_number = function(event, field, max, message)
   {
  -     var num = eval(field.value)
  +     var value = field.value;
  +     
  +     if (value == "") return;
        
  -    if (num > max)
  +    if (Number(value) > max)
         event.invalid_field(field, message)
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]