Merge #5400 and #5401 from 4.1 into 5.0

eclipse-ee4j · Feb 12, 2024 · d918884 · d918884
2 parents 28bf336 + b31df99
commit d918884
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/impl/src/main/java/com/sun/faces/util/Util.java b/impl/src/main/java/com/sun/faces/util/Util.java
@@ -1703,7 +1703,9 @@ public static String getResponseEncoding(FacesContext context, Optional<String>
 
         if (encoding == null) {
             // 5. If still none found then fall back to specified default.
-            encoding = defaultEncoding.get();
+            if (defaultEncoding.isPresent()) {
+                encoding = defaultEncoding.get();
+            }
 
             if (encoding != null && !encoding.isBlank()) {
                 if (LOGGER.isLoggable(FINEST)) {

diff --git a/impl/src/main/resources/META-INF/resources/jakarta.faces/faces-uncompressed.js b/impl/src/main/resources/META-INF/resources/jakarta.faces/faces-uncompressed.js
@@ -651,11 +651,14 @@ if ( !( (window.faces && window.faces.specversion && window.faces.specversion >=
         const coreElementProperties = ['className', 'title', 'lang', 'xmllang'];
 
         // enumerate additional input element attributes
-        const inputElementProperties = [ 'name', 'value', 'size', 'maxLength', 'src', 'alt', 'useMap', 'tabIndex', 'accessKey', 'accept', 'type' ];
+        const inputElementProperties = [ 'name', 'value', 'src', 'alt', 'useMap', 'tabIndex', 'accessKey', 'accept', 'type' ];
 
         // core + input element properties
         const coreAndInputElementProperties = coreElementProperties.concat(inputElementProperties);
 
+        // enumerate additional integer input attributes
+        const inputElementPositiveIntegerProperties = [ 'size', 'maxLength' ];
+
         // enumerate additional boolean input attributes
         const inputElementBooleanProperties = [ 'checked', 'disabled', 'readOnly' ];
 
@@ -679,10 +682,17 @@ if ( !( (window.faces && window.faces.specversion && window.faces.specversion >=
                 if (isNotNull(sourceValue)) target[propertyName] = sourceValue;
             }
 
-            const booleanPropertyNames = isInputElement ? inputElementBooleanProperties : [];
-            for (const booleanPropertyName of booleanPropertyNames) {
-                const newBooleanValue = source[booleanPropertyName];
-                if (isNotNull(newBooleanValue)) target[booleanPropertyName] = newBooleanValue;
+            if (isInputElement) {
+                for (const propertyName of inputElementPositiveIntegerProperties) {
+                    const attributeName = propertyToAttribute(propertyName);
+                    const sourceValue = isXML ? source.getAttribute(attributeName) : source[propertyName];
+                    if (parseInt(sourceValue) >= 0) target[propertyName] = sourceValue;
+                }
+
+                for (const booleanPropertyName of inputElementBooleanProperties) {
+                    const newBooleanValue = source[booleanPropertyName];
+                    if (isNotNull(newBooleanValue)) target[booleanPropertyName] = newBooleanValue;
+                }
             }
 
             //'style' attribute special case