Merge branch 'hotfix-1.2.5' into stable

Author: sebduggan

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Generate release version number
         if: "env.PUBLISH == 'true'"
         id: versiongen
-        uses: pixl8/github-action-twgit-release-version-generator@v2
+        uses: pixl8/github-action-twgit-release-version-generator@v3
 
       - name: Inject version into box json
         if: "env.PUBLISH == 'true'"
@@ -95,7 +95,7 @@ jobs:
 
       - name: Publish to forgebox
         if: "env.PUBLISH == 'true'"
-        uses: pixl8/github-action-box-publish@v3
+        uses: pixl8/github-action-box-publish@v5
         with:
           forgebox_user: ${{ secrets.FORGEBOX_USER }}
           forgebox_pass: ${{ secrets.FORGEBOX_PASS }}

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.5
+
+* JS validators fail if value is null
+
 ## v1.2.4
 
 * Apply translation manager CI action

services/validation/ValidationExtrasValidators.cfc

@@ -21,7 +21,7 @@ component {
 		return arguments.data.keyExists( fieldName ) && !IsEmpty( value );
 	}
 	public string function requiredIfOtherFieldChecked_js() validatorMessage="cms:validation.conditional.required.default" {
-		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']:checked' ); if ( !$otherField.length || !$otherField.is( ':checked' ) || ( params[1] != null && $otherField.val() != params[1] ) ) { return true; } return ( value.length > 0 ); }";
+		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']:checked' ); if ( !$otherField.length || !$otherField.is( ':checked' ) || ( params[1] != null && $otherField.val() != params[1] ) ) { return true; } return ( value && value.length > 0 ); }";
 	}
 
 
@@ -32,7 +32,7 @@ component {
 		return arguments.data.keyExists( fieldName ) && !IsEmpty( value );
 	}
 	public string function requiredIfOtherFieldNotChecked_js() validatorMessage="cms:validation.conditional.required.default" {
-		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length || $otherField.is( ':checked' ) ) { return true; } return ( value.length > 0 ); }";
+		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length || $otherField.is( ':checked' ) ) { return true; } return ( value && value.length > 0 ); }";
 	}
 
 
@@ -43,7 +43,7 @@ component {
 		return arguments.data.keyExists( fieldName ) && !IsEmpty( value );
 	}
 	public string function requiredIfOtherFieldEmpty_js() validatorMessage="cms:validation.conditional.required.default" {
-		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length || $otherField.val().length ) { return true; } return ( value.length > 0 ); }";
+		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length || $otherField.val().length ) { return true; } return ( value && value.length > 0 ); }";
 	}
 
 
@@ -54,7 +54,7 @@ component {
 		return arguments.data.keyExists( fieldName ) && !IsEmpty( value );
 	}
 	public string function requiredIfOtherFieldNotEmpty_js() validatorMessage="cms:validation.conditional.required.default" {
-		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length || !$otherField.val().length ) { return true; } return ( value.length > 0 ); }";
+		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length || !$otherField.val().length ) { return true; } return ( value && value.length > 0 ); }";
 	}
 
 
@@ -65,7 +65,7 @@ component {
 		return arguments.data.keyExists( fieldName ) && !IsEmpty( value );
 	}
 	public string function requiredIfOtherFieldValue_js() validatorMessage="cms:validation.required.default" {
-		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length ) { return true}; var otherValue = $otherField.prop('type')=='radio'?$( '[name=' + params[0] + ']:checked').val() : $otherField.val(); if ( otherValue != params[1] ) { return true; } return ( value.length > 0 ); }";
+		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length ) { return true}; var otherValue = $otherField.prop('type')=='radio'?$( '[name=' + params[0] + ']:checked').val() : $otherField.val(); if ( otherValue != params[1] ) { return true; } return ( value && value.length > 0 ); }";
 	}
 
 	public boolean function requiredIfOtherFieldMatchSystemLookup( required string fieldName, any value="", struct data={}, required string otherField, required string category, required setting ) validatorMessage="cms:validation.conditional.required.default" {
@@ -75,7 +75,7 @@ component {
 		if ( !len( trim ( lookupValue ) ) || !len( trim( otherFieldValue ) ) ) {
 			return true;
 		}
-		
+
 		return !( listFindNoCase( lookupValue, otherFieldValue ) && !len( trim( value ) ) );
 	}
 	public string function requiredIfOtherFieldMatchSystemLookup_js() {
@@ -92,7 +92,7 @@ component {
 	}
 
 	public string function requiredIfOtherFieldInValues_js() validatorMessage="cms:validation.required.default" {
-		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length ) { return true}; var otherValue = $otherField.prop('type')=='radio'?$( '[name=' + params[0] + ']:checked').val() : $otherField.val(); var otherValues = params[1].split(',');if ( !otherValues.includes( otherValue ) ) { return true; } return ( value.length > 0 ); }";
+		return "function( value, el, params ){ $otherField = $( '[name=' + params[0] + ']' ); if ( !$otherField.length ) { return true}; var otherValue = $otherField.prop('type')=='radio'?$( '[name=' + params[0] + ']:checked').val() : $otherField.val(); var otherValues = params[1].split(',');if ( !otherValues.includes( otherValue ) ) { return true; } return ( value && value.length > 0 ); }";
 	}
 
 	public boolean function simpleUrl( required string fieldName, any value="" ) validatorMessage="validationExtras:validation.simpleUrl.default" {