User: roelofb
Date: 2008/09/01 04:19 AM
Modified:
/trunk/Components/Validator/Castle.Components.Validator/
IBrowserValidationGenerator.cs
/trunk/Components/Validator/Castle.Components.Validator/Attributes/
ValidateIsLesserAttribute.cs
/trunk/Components/Validator/Castle.Components.Validator/Validators/
IsLesserValidator.cs
/trunk/MonoRail/Castle.MonoRail.ActiveRecordSupport/
Castle.MonoRail.ActiveRecordSupport-vs2008.csproj
/trunk/MonoRail/Castle.MonoRail.Framework.Tests/Helpers/Validations/
FormValidationTestCase.cs, JQueryFormValidationTestCase.cs
/trunk/MonoRail/Castle.MonoRail.Framework/Helpers/
AbstractFormRelatedHelper.cs
/trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/
FValidateValidator.cs, JQueryValidator.cs, PrototypeWebValidator.cs,
ZebdaWebValidator.cs
Log:
Applied Gildas' patch 'Castle.Monorail - JQuery Validation OnDocumentReady -
FormTestFix.patch' for MR-ISSUE-433.
File Changes:
Directory: /trunk/Components/Validator/Castle.Components.Validator/Attributes/
==============================================================================
File [modified]: ValidateIsLesserAttribute.cs
Delta lines: +1 -2
===================================================================
---
trunk/Components/Validator/Castle.Components.Validator/IBrowserValidationGenerator.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/Components/Validator/Castle.Components.Validator/IBrowserValidationGenerator.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -198,7 +198,7 @@
/// <param name="comparisonFieldName">The name of the field to
compare with.</param>
/// <param name="validationType">The type of data to
compare.</param>
/// <param name="violationMessage">The violation
message.</param>
- void SetAsLesserThan(string target, string comparisonFieldName,
IsGreaterValidationType validationType,string violationMessage);
+ void SetAsLesserThan( string target, string
comparisonFieldName, IsLesserValidationType validationType, string
violationMessage );
/// <summary>
/// Sets that a flied is part of a group validation.
@@ -209,4 +209,4 @@
/// <param name="violationMessage">The violation
message.</param>
void SetAsGroupValidation(string target, string groupName,
string violationMessage);
}
-}
\ No newline at end of file
Directory: /trunk/Components/Validator/Castle.Components.Validator/
===================================================================
File [modified]: IBrowserValidationGenerator.cs
Delta lines: +9 -9
===================================================================
---
trunk/Components/Validator/Castle.Components.Validator/Validators/IsLesserValidator.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/Components/Validator/Castle.Components.Validator/Validators/IsLesserValidator.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -50,7 +50,7 @@
{
#region Private variables
- private readonly IsGreaterValidationType validationType;
+ private readonly IsLesserValidationType validationType;
#endregion
@@ -61,7 +61,7 @@
/// </summary>
/// <param name="type">The type of data to compare.</param>
/// <param name="propertyToCompare">The name of the property to
compare.</param>
- public IsLesserValidator( IsGreaterValidationType type, string
propertyToCompare )
+ public IsLesserValidator( IsLesserValidationType type, string
propertyToCompare )
: base(propertyToCompare)
{
this.validationType = type;
@@ -74,7 +74,7 @@
/// <summary>
/// Gets or sets the validation type for this validator.
/// </summary>
- public IsGreaterValidationType ValidationType
+ public IsLesserValidationType ValidationType
{
get { return validationType; }
}
@@ -99,7 +99,7 @@
switch (validationType)
{
- case IsGreaterValidationType.Integer:
+ case IsLesserValidationType.Integer:
int intRefVal;
int intFieldValue;
@@ -110,7 +110,7 @@
break;
- case IsGreaterValidationType.Decimal:
+ case IsLesserValidationType.Decimal:
decimal decRefVal;
decimal decFieldVal;
@@ -121,8 +121,8 @@
break;
- case IsGreaterValidationType.DateTime:
- case IsGreaterValidationType.Date:
+ case IsLesserValidationType.DateTime:
+ case IsLesserValidationType.Date:
DateTime dateRefVal;
DateTime dateFieldVal;
@@ -130,12 +130,12 @@
DateTime.TryParse(refValue.ToString(),
out dateRefVal);
DateTime.TryParse(fieldValue.ToString(), out dateFieldVal);
- if (validationType ==
IsGreaterValidationType.DateTime)
+ if (validationType ==
IsLesserValidationType.DateTime)
{
valid = dateFieldVal <
dateRefVal;
}
- if (validationType ==
IsGreaterValidationType.Date)
+ if (validationType ==
IsLesserValidationType.Date)
{
valid = dateFieldVal <
dateRefVal;
Directory: /trunk/MonoRail/Castle.MonoRail.ActiveRecordSupport/
===============================================================
File [modified]: Castle.MonoRail.ActiveRecordSupport-vs2008.csproj
Delta lines: +16 -5
===================================================================
---
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/AbstractFormRelatedHelper.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/AbstractFormRelatedHelper.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -743,14 +743,25 @@
bool validList = false;
- if (list == null && instanceType.IsGenericType)
+ if (list == null )
{
- Type[] genArgs =
instanceType.GetGenericArguments();
+ Type genericType = instanceType;
- Type genList =
typeof(System.Collections.Generic.IList<>).MakeGenericType(genArgs);
- Type genTypeDef =
instanceType.GetGenericTypeDefinition().MakeGenericType(genArgs);
+ do
+ {
+ if ( genericType.IsGenericType )
+ {
+ Type[] genArgs =
instanceType.GetGenericArguments();
- validList =
genList.IsAssignableFrom(genTypeDef);
+ Type genList = typeof(
System.Collections.Generic.IList<> ).MakeGenericType( genArgs );
+ Type genTypeDef =
instanceType.GetGenericTypeDefinition().MakeGenericType( genArgs );
+
+ validList =
genList.IsAssignableFrom( genTypeDef );
+ }
+ else
+ genericType =
genericType.BaseType;
+ }while ( genericType.BaseType != typeof( object
) );
+
}
Directory: /trunk/MonoRail/Castle.MonoRail.Framework/Helpers/
=============================================================
File [modified]: AbstractFormRelatedHelper.cs
Delta lines: +2 -2
===================================================================
---
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/FValidateValidator.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/FValidateValidator.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -346,7 +346,7 @@
/// <param name="validationType">The type of data to
compare.</param>
/// <param name="violationMessage">The violation
message.</param>
/// <remarks>Not implemented by the JQuery validate
plugin. Done via a custom rule.</remarks>
- public void SetAsGreaterThan( string target, string
comparisonFieldName, Castle.Components.Validator.IsGreaterValidationType
validationType, string violationMessage )
+ public void SetAsGreaterThan( string target, string
comparisonFieldName, IsGreaterValidationType validationType, string
violationMessage )
{
}
@@ -358,7 +358,7 @@
/// <param name="comparisonFieldName">The name of the
field to compare with.</param>
/// <param name="validationType">The type of data to
compare.</param>
/// <param name="violationMessage">The violation
message.</param>
- public void SetAsLesserThan( string target, string
comparisonFieldName, IsGreaterValidationType validationType, string
violationMessage )
+ public void SetAsLesserThan( string target, string
comparisonFieldName, IsLesserValidationType validationType, string
violationMessage )
{
}
Directory: /trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/
================================================================================
File [modified]: FValidateValidator.cs
Delta lines: +86 -48
===================================================================
---
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/JQueryValidator.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/JQueryValidator.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -74,12 +74,18 @@
/// </summary>
public class JQueryConfiguration :
BrowserValidationConfiguration
{
+ #region Constants
+ const string AjaxOptionsPrefix = "ajax-";
+
+ #endregion Constants
+
#region Instance Variables
readonly Dictionary<String, CustomRule> _customRules =
new Dictionary<String, CustomRule>();
readonly Dictionary<string, string> _rules = new
Dictionary<string, string>();
readonly IDictionary _options = new Hashtable();
+ readonly IDictionary _ajaxOptions = new Hashtable();
readonly Dictionary<string, Group> _groups = new
Dictionary<string, Group>();
readonly IDictionary<string, IDictionary>
_customClasses = new Dictionary<string, IDictionary>();
@@ -134,29 +140,39 @@
/// <param name="parameters">The parameters.</param>
public override void Configure( IDictionary parameters )
{
- AddParameterToOptions( parameters,
JQueryOptions.Debug, false );
- AddParameterToOptions( parameters,
JQueryOptions.ErrorClass, true );
- AddParameterToOptions( parameters,
JQueryOptions.ErrorContainer, true );
- AddParameterToOptions( parameters,
JQueryOptions.ErrorElement, true );
- AddParameterToOptions( parameters,
JQueryOptions.ErrorLabelContainer, true );
- AddParameterToOptions( parameters,
JQueryOptions.ErrorPlacement, false );
- AddParameterToOptions( parameters,
JQueryOptions.FocusCleanup, false );
- AddParameterToOptions( parameters,
JQueryOptions.FocusInvalid, false );
- AddParameterToOptions( parameters,
JQueryOptions.Highlight, false );
- AddParameterToOptions( parameters,
JQueryOptions.Ignore, true );
- AddParameterToOptions( parameters,
JQueryOptions.Messages, false );
- AddParameterToOptions( parameters,
JQueryOptions.Meta, true );
- AddParameterToOptions( parameters,
JQueryOptions.OnClick, false );
- AddParameterToOptions( parameters,
JQueryOptions.OnFocusOut, false );
- AddParameterToOptions( parameters,
JQueryOptions.OnKeyUp, false );
- AddParameterToOptions( parameters,
JQueryOptions.OnSubmit, false );
- AddParameterToOptions( parameters,
JQueryOptions.ShowErrors, false );
- AddParameterToOptions( parameters,
JQueryOptions.SubmitHandler, false );
- AddParameterToOptions( parameters,
JQueryOptions.Success, false );
- AddParameterToOptions( parameters,
JQueryOptions.Unhighlight, false );
- AddParameterToOptions( parameters,
JQueryOptions.Wrapper, true );
- AddParameterToOptions( parameters,
JQueryOptions.IsAjax, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Debug, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.ErrorClass, true );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.ErrorContainer, true );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.ErrorElement, true );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.ErrorLabelContainer, true );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.ErrorPlacement, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.FocusCleanup, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.FocusInvalid, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Highlight, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Ignore, true );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Messages, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Meta, true );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.OnClick, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.OnFocusOut, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.OnKeyUp, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.OnSubmit, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.ShowErrors, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.SubmitHandler, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Success, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Unhighlight, false );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.Wrapper, true );
+ AddParameterToOptions( parameters, _options,
JQueryOptions.IsAjax, false );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxBeforeSubmit, false, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxClearForm, false, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxDataType, true, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxResetForm, false, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxSemantic, false, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxSuccess, false, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxTarget, true, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxType, true, AjaxOptionsPrefix );
+ AddParameterToOptions( parameters,
_ajaxOptions, JQueryOptions.AjaxUrl, true, AjaxOptionsPrefix );
+
AddCustomRules();
}
@@ -176,7 +192,10 @@
}
bool isAjax = false;
- bool.TryParse(
CommonUtils.ObtainEntryAndRemove( _options, JQueryOptions.IsAjax,
bool.FalseString ), out isAjax );
+ bool.TryParse( CommonUtils.ObtainEntryAndRemove(
+ _options,
+ JQueryOptions.IsAjax,
+ bool.FalseString ), out isAjax );
if( isAjax )
{
@@ -184,7 +203,21 @@
if( submitHandler == null )
{
- _options.Add(
JQueryOptions.SubmitHandler, "function( form ) { jQuery( form ).ajaxSubmit();
}" );
+ if( _ajaxOptions.Count > 0 )
+ {
+ _options.Add(
+
JQueryOptions.SubmitHandler,
+ string.Concat(
+
"function( form ) { jQuery( form ).ajaxSubmit( ",
+
AjaxHelper.JavascriptOptions( _ajaxOptions ),
+ "); }"
) );
+ }
+ else
+ {
+ _options.Add(
+
JQueryOptions.SubmitHandler,
+ "function( form
) { jQuery( form ).ajaxSubmit(); }" );
+ }
}
}
@@ -192,6 +225,7 @@
GenerateGroupNotEmptyValidatorCustomRule();
GenerateGroupNotEmptyValidatorCustomClass();
+ stringBuilder.Append( "jQuery( document
).ready( function() { " );
stringBuilder.AppendFormat("jQuery(\"#{0}\").validate( {1} );", formId,
AbstractHelper.JavascriptOptions(_options));
if ( _customRules.Count > 0 )
@@ -222,6 +256,8 @@
}
}
+ stringBuilder.Append(" });");
+
return AbstractHelper.ScriptBlock(
stringBuilder.ToString() );
}
@@ -311,36 +347,29 @@
AddCustomRule( "lesserThan", "Must be lesser
than {0}.", "function(value, element, param) { return ( IsNaN( value ) &&
IsNaN( jQuery(param).val() ) ) || ( value < jQuery(param).val() ); }" );
}
- void AddParameterToOptions( IDictionary parameters,
string parameterName, bool quote )
+ static void AddParameterToOptions( IDictionary
parameters, IDictionary options, string parameterName, bool quote )
{
+ AddParameterToOptions( parameters, options,
parameterName, quote, string.Empty );
+ }
+
+ static void AddParameterToOptions( IDictionary
parameters, IDictionary options, string parameterName, bool quote, string
prefixToRemove )
+ {
string parameterValue =
CommonUtils.ObtainEntryAndRemove( parameters, parameterName, null );
+ string parameterNameToInsert = parameterName;
- if( parameterValue != null )
+ if( !string.IsNullOrEmpty( prefixToRemove ) )
{
- if( quote )
- if( !parameterValue.StartsWith(
"'" ) && !parameterValue.StartsWith( "\"" ) )
- _options.Add(
parameterName, AbstractHelper.SQuote( parameterValue ) );
- else
- _options.Add(
parameterName, parameterValue );
- else
- _options.Add( parameterName,
parameterValue );
+ parameterNameToInsert =
parameterName.Replace( prefixToRemove, string.Empty );
}
- }
- void AddParameterToOptions( IDictionary parameters,
string parameterName, bool quote, string defaultValue )
- {
- string parameterValue =
CommonUtils.ObtainEntryAndRemove( parameters, parameterName, defaultValue );
-
if( parameterValue != null )
{
- if( quote )
- if( !parameterValue.StartsWith(
"'" ) && !parameterValue.StartsWith( "\"" ) )
- _options.Add(
parameterName, AbstractHelper.SQuote( parameterValue ) );
- else
- _options.Add(
parameterName, parameterValue );
+ if( quote &&
!parameterValue.StartsWith( "'" ) && !parameterValue.StartsWith( "\"" ) )
+ options.Add(
parameterNameToInsert, AbstractHelper.SQuote( parameterValue ) );
else
- _options.Add( parameterName,
parameterValue );
+ options.Add(
parameterNameToInsert, parameterValue );
}
+
}
#endregion Private Methods
@@ -494,6 +523,15 @@
public const string Wrapper = "wrapper";
public const string IsAjax = "isAjax";
+ public const string AjaxTarget = "ajax-target";
+ public const string AjaxUrl = "ajax-url";
+ public const string AjaxType = "ajax-type";
+ public const string AjaxBeforeSubmit =
"ajax-beforeSubmit";
+ public const string AjaxSuccess =
"ajax-success";
+ public const string AjaxDataType =
"ajax-dataType";
+ public const string AjaxSemantic =
"ajax-semantic";
+ public const string AjaxResetForm =
"ajax-resetForm";
+ public const string AjaxClearForm =
"ajax-clearForm";
}
#endregion Nested classes
@@ -861,14 +899,14 @@
/// <param name="comparisonFieldName">The name of the
field to compare with.</param>
/// <param name="validationType">The type of data to
compare.</param>
/// <param name="violationMessage">The violation
message.</param>
- public void SetAsLesserThan( string target, string
comparisonFieldName, IsGreaterValidationType validationType, string
violationMessage )
+ public void SetAsLesserThan( string target, string
comparisonFieldName, IsLesserValidationType validationType, string
violationMessage )
{
- if( validationType ==
IsGreaterValidationType.Decimal || validationType ==
IsGreaterValidationType.Integer )
+ if( validationType ==
IsLesserValidationType.Decimal || validationType ==
IsLesserValidationType.Integer )
{
- string prefixedComparisonFieldName =
GetPrefixJQuerySelector(GetPrefixedFieldld(target, comparisonFieldName));
+ string prefixedComparisonFieldName =
GetPrefixJQuerySelector( GetPrefixedFieldld( target, comparisonFieldName ) );
AddClass( "lesserThan" );
- AddParameter("lesserThan",
prefixedComparisonFieldName);
+ AddParameter( "lesserThan",
prefixedComparisonFieldName );
AddTitle( violationMessage );
}
File [modified]: JQueryValidator.cs
Delta lines: +1 -1
===================================================================
---
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/PrototypeWebValidator.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/PrototypeWebValidator.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -471,7 +471,7 @@
/// <param name="comparisonFieldName">The name of the
field to compare with.</param>
/// <param name="validationType">The type of data to
compare.</param>
/// <param name="violationMessage">The violation
message.</param>
- public void SetAsLesserThan( string target, string
comparisonFieldName, IsGreaterValidationType validationType, string
violationMessage )
+ public void SetAsLesserThan( string target, string
comparisonFieldName, IsLesserValidationType validationType, string
violationMessage )
{
}
File [modified]: PrototypeWebValidator.cs
Delta lines: +1 -1
===================================================================
---
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/ZebdaWebValidator.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.Framework/Helpers/ValidationStrategy/ZebdaWebValidator.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -387,7 +387,7 @@
/// <param name="comparisonFieldName">The name of the field to
compare with.</param>
/// <param name="validationType">The type of data to
compare.</param>
/// <param name="violationMessage">The violation
message.</param>
- public void SetAsLesserThan( string target, string
comparisonFieldName, IsGreaterValidationType validationType, string
violationMessage )
+ public void SetAsLesserThan( string target, string
comparisonFieldName, IsLesserValidationType validationType, string
violationMessage )
{
}
File [modified]: ZebdaWebValidator.cs
Delta lines: +1 -1
===================================================================
---
trunk/MonoRail/Castle.MonoRail.Framework.Tests/Helpers/Validations/FormValidationTestCase.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.Framework.Tests/Helpers/Validations/FormValidationTestCase.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -222,7 +222,7 @@
set { firstValue = value; }
}
- [ValidateIsLesser(IsGreaterValidationType.Integer,
"FirstValue")]
+ [ValidateIsLesser(IsLesserValidationType.Integer, "FirstValue")]
public int SecondValue
{
Directory: /trunk/MonoRail/Castle.MonoRail.Framework.Tests/Helpers/Validations/
===============================================================================
File [modified]: FormValidationTestCase.cs
Delta lines: +2 -2
===================================================================
---
trunk/MonoRail/Castle.MonoRail.Framework.Tests/Helpers/Validations/JQueryFormValidationTestCase.cs
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.Framework.Tests/Helpers/Validations/JQueryFormValidationTestCase.cs
2008-09-01 11:19:11 UTC (rev 5301)
@@ -177,7 +177,7 @@
helper.Pop();
Assert.AreEqual(
- "\r\n<script
type=\"text/javascript\">\r\njQuery(\"#form1\").validate( {groups:{mygroup1:
\"model.GroupValue1 model.GroupValue2 \",\r\nmygroup2: \"model.GroupValue3
model.GroupValue4 \",\r\n}} );\r\njQuery.validator.addMethod('notEqualTo',
function(value, element, param) { return value != jQuery(param).val(); }, 'Must
not be equal to {0}.' );\r\njQuery.validator.addMethod('greaterThan',
function(value, element, param) { return ( IsNaN( value ) && IsNaN(
jQuery(param).val() ) ) || ( value > jQuery(param).val() ); }, 'Must be greater
than {0}.' );\r\njQuery.validator.addMethod('lesserThan', function(value,
element, param) { return ( IsNaN( value ) && IsNaN( jQuery(param).val() ) ) ||
( value < jQuery(param).val() ); }, 'Must be lesser than {0}.'
);\r\njQuery.validator.addMethod('mygroup1', function() {
if($(\"#model_GroupValue1\").val()!='' || $(\"#model_GroupValue2\").val()!='')
{ return true } else { return false; } }, 'At least one of the values should
not be empty' );\r\njQuery.validator.addMethod('mygroup2', function() {
if($(\"#model_GroupValue3\").val()!='' || $(\"#model_GroupValue4\").val()!='')
{ return true } else { return false; } }, 'At least one of the values should
not be empty' );\r\njQuery.validator.addClassRules({requiredmygroup1:
{mygroup1:true}});\r\njQuery.validator.addClassRules({requiredmygroup2:
{mygroup2:true}});</script>\r\n</form>"
+ "\r\n<script
type=\"text/javascript\">\r\njQuery( document ).ready( function() {
jQuery(\"#form1\").validate( {groups:{mygroup1: \"model.GroupValue1
model.GroupValue2 \",\r\nmygroup2: \"model.GroupValue3 model.GroupValue4
\",\r\n}} );\r\njQuery.validator.addMethod('notEqualTo', function(value,
element, param) { return value != jQuery(param).val(); }, 'Must not be equal to
{0}.' );\r\njQuery.validator.addMethod('greaterThan', function(value, element,
param) { return ( IsNaN( value ) && IsNaN( jQuery(param).val() ) ) || ( value >
jQuery(param).val() ); }, 'Must be greater than {0}.'
);\r\njQuery.validator.addMethod('lesserThan', function(value, element, param)
{ return ( IsNaN( value ) && IsNaN( jQuery(param).val() ) ) || ( value <
jQuery(param).val() ); }, 'Must be lesser than {0}.'
);\r\njQuery.validator.addMethod('mygroup1', function() {
if($(\"#model_GroupValue1\").val()!='' || $(\"#model_GroupValue2\").val()!='')
{ return true } else { return false; } }, 'At least one of the values should
not be empty' );\r\njQuery.validator.addMethod('mygroup2', function() {
if($(\"#model_GroupValue3\").val()!='' || $(\"#model_GroupValue4\").val()!='')
{ return true } else { return false; } }, 'At least one of the values should
not be empty' );\r\njQuery.validator.addClassRules({requiredmygroup1:
{mygroup1:true}});\r\njQuery.validator.addClassRules({requiredmygroup2:
{mygroup2:true}}); });</script>\r\n</form>"
,helper.EndFormTag());
}
@@ -222,7 +222,7 @@
{
helper.FormTag( DictHelper.CreateN( "isAjax", true ).N(
"noaction", true ) );
- Assert.AreEqual( "\r\n<script
type=\"text/javascript\">\r\njQuery(\"#form1\").validate(
{submitHandler:function( form ) { jQuery( form ).ajaxSubmit(); }}
);\r\njQuery.validator.addMethod('notEqualTo', function(value, element, param)
{ return value != jQuery(param).val(); }, 'Must not be equal to {0}.'
);\r\njQuery.validator.addMethod('greaterThan', function(value, element, param)
{ return ( IsNaN( value ) && IsNaN( jQuery(param).val() ) ) || ( value >
jQuery(param).val() ); }, 'Must be greater than {0}.'
);\r\njQuery.validator.addMethod('lesserThan', function(value, element, param)
{ return ( IsNaN( value ) && IsNaN( jQuery(param).val() ) ) || ( value <
jQuery(param).val() ); }, 'Must be lesser than {0}.' );</script>\r\n</form>",
helper.EndFormTag() );
+ Assert.AreEqual( "\r\n<script
type=\"text/javascript\">\r\njQuery( document ).ready( function() {
jQuery(\"#form1\").validate( {submitHandler:function( form ) { jQuery( form
).ajaxSubmit(); }} );\r\njQuery.validator.addMethod('notEqualTo',
function(value, element, param) { return value != jQuery(param).val(); }, 'Must
not be equal to {0}.' );\r\njQuery.validator.addMethod('greaterThan',
function(value, element, param) { return ( IsNaN( value ) && IsNaN(
jQuery(param).val() ) ) || ( value > jQuery(param).val() ); }, 'Must be greater
than {0}.' );\r\njQuery.validator.addMethod('lesserThan', function(value,
element, param) { return ( IsNaN( value ) && IsNaN( jQuery(param).val() ) ) ||
( value < jQuery(param).val() ); }, 'Must be lesser than {0}.' );
});</script>\r\n</form>", helper.EndFormTag() );
}
}
File [modified]: JQueryFormValidationTestCase.cs
Delta lines: +0 -0
===================================================================
Directory: /trunk/Components/Validator/Castle.Components.Validator/Validators/
==============================================================================
File [modified]: IsLesserValidator.cs
Delta lines: +4 -5
===================================================================
---
trunk/MonoRail/Castle.MonoRail.ActiveRecordSupport/Castle.MonoRail.ActiveRecordSupport-vs2008.csproj
2008-08-31 20:25:17 UTC (rev 5300)
+++
trunk/MonoRail/Castle.MonoRail.ActiveRecordSupport/Castle.MonoRail.ActiveRecordSupport-vs2008.csproj
2008-09-01 11:19:11 UTC (rev 5301)
@@ -72,10 +72,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Castle.ActiveRecord, Version=1.0.3.0, Culture=neutral,
PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\build\net-3.5\debug\Castle.ActiveRecord.dll</HintPath>
- </Reference>
<Reference
Include="Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine,
Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc,
processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\build\net-2.0\debug\Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.dll</HintPath>
@@ -101,6 +97,10 @@
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
+ <ProjectReference
Include="..\..\ActiveRecord\Castle.ActiveRecord\Castle.ActiveRecord-vs2008.csproj">
+ <Project>{652F95D4-86E2-40B6-919D-CFC6E449386B}</Project>
+ <Name>Castle.ActiveRecord-vs2008</Name>
+ </ProjectReference>
<ProjectReference
Include="..\..\Components\Binder\Castle.Components.Binder\Castle.Components.Binder-vs2008.csproj">
<Project>{98F19522-C9B8-400D-8A12-DABB3DA9411D}</Project>
<Name>Castle.Components.Binder-vs2008</Name>
@@ -185,4 +185,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
-</Project>
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Castle Project Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/castle-project-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
