gina 0.6.0 → 0.6.1

package/framework/{v0.6.0 → v0.6.1}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -3013,6 +3013,42 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet, culture) {
      * @type {Object.<string, boolean>}
      */
     var _labelWarnings = {};
+    /**
+     * #B178 — errors-key / label-key alias fill for app-supplied labels.
+     *
+     * Four rule families consult a SPECIFIC label key while writing the error
+     * under a GENERIC one (the NaN branch of the float coercion, and the
+     * min/max variants of the three Length families), so the key an app can
+     * OBSERVE in a field's `errors` object is not the key the catalog is
+     * consulted under — translating the observable key was a silent no-op.
+     * This copies each app-supplied generic onto the specifics the app did
+     * not supply itself. English defaults are never touched here; an
+     * app-supplied specific key always wins over its generic.
+     * @inner
+     * @param {object} labels - app-supplied label map (extended in place)
+     * @returns {object} the same map, alias keys filled
+     */
+    var _labelAliasFill = function(labels) {
+        // consulted (specific) key <- supplied (observable/generic) key
+        var aliasMap = {
+            'toFloatNAN'         : 'toFloat',
+            'isNumberMinLength'  : 'isNumberLength',
+            'isNumberMaxLength'  : 'isNumberLength',
+            'isIntegerMinLength' : 'isIntegerLength',
+            'isIntegerMaxLength' : 'isIntegerLength',
+            'isStringMinLength'  : 'isStringLength',
+            'isStringMaxLength'  : 'isStringLength'
+        };
+        for (var specific in aliasMap) {
+            if (
+                typeof(labels[specific]) == 'undefined'
+                && typeof(labels[aliasMap[specific]]) != 'undefined'
+            ) {
+                labels[specific] = labels[aliasMap[specific]];
+            }
+        }
+        return labels;
+    };
     local.errorLabels = _defaultErrorLabels;
     // #i18n (server) — resolve built-in rule labels from the bundle catalog's
     // `_validator.<rule>` namespace for the negotiated `culture`. Mirrors the client
@@ -3031,7 +3067,11 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet, culture) {
                     if (_vFound && typeof(_vFound) === 'object') { _vNode = _vFound; break; }
                 }
             }
-            if (_vNode) { local.errorLabels = merge(JSON.clone(_vNode), _defaultErrorLabels); }
+            if (_vNode) {
+                // #B178 — fill consulted-key aliases from the app's observable keys first
+                _vNode = _labelAliasFill(JSON.clone(_vNode));
+                local.errorLabels = merge(JSON.clone(_vNode), _defaultErrorLabels);
+            }
         }
     }
     // #i18n (client) — overlay built-in rule labels for the negotiated culture.
@@ -3064,9 +3104,12 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet, culture) {
         }
         // apply lowest-precedence layer first, then let each higher layer win per key
         if (_catalogLabels) {
+            // #B178 — alias fill on a copy, so the whispered config object is never mutated
+            _catalogLabels = _labelAliasFill(JSON.clone(_catalogLabels));
             local.errorLabels = merge(JSON.clone(_catalogLabels), local.errorLabels);
         }
         if (_cultureLabels) {
+            _cultureLabels = _labelAliasFill(JSON.clone(_cultureLabels));
             local.errorLabels = merge(JSON.clone(_cultureLabels), local.errorLabels);
         }
     }
@@ -4112,7 +4155,9 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet, culture) {
             }
 
             if (!isValid) {
-                errors[alias] = replace(this.error || errorMessage || local.errorLabels[alias], this, alias);
+                // #B178 — numbered aliases (is1, is2, ...) have no per-alias default
+                // label: fall back to the shared base label instead of an empty message
+                errors[alias] = replace(this.error || errorMessage || local.errorLabels[alias] || local.errorLabels['is'], this, alias);
                 if ( typeof(errorStack) != 'undefined' )
                     errors['stack'] = errorStack;
             }
@@ -5029,8 +5074,13 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet, culture) {
             try {
                 for (let v in gina.forms.validators) {
                     filename = '/validators/'+ v + '/main.js';
-                    // setting default local error
-                    local.errorLabels[v] = 'Condition not satisfied';
+                    // setting default local error — #B178: only when the app has not
+                    // already supplied one (catalog or setErrorLabels); the former
+                    // unconditional assignment clobbered app translations for every
+                    // user-validator key
+                    if ( typeof(local.errorLabels[v]) == 'undefined' ) {
+                        local.errorLabels[v] = 'Condition not satisfied';
+                    }
                     // converting Buffer to string
                     if ( isGFFCtx ) {
                         //userValidatorError = String.fromCharCode.apply(null, new Uint16Array(gina.forms.validators[v].data));
@@ -5251,8 +5301,25 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet, culture) {
         return target
     }
 
+    /**
+     * Override error labels per rule key — an app-supplied key wins over the
+     * culture catalog and the English defaults for this validator instance.
+     *
+     * #B178 — the supplied map is alias-filled first, so translating an
+     * OBSERVABLE errors key (e.g. the float coercion's key, or a Length
+     * family's generic key) also covers the specific label keys the engine
+     * actually consults (its NaN variant, the min/max variants). A supplied
+     * specific key still wins over its generic. Note the passed object is
+     * extended in place (it already was, via the merge).
+     *
+     * @param {Object.<string, string>} errorLabels - rule key to label text
+     * @returns {void}
+     * @example
+     * validator.setErrorLabels({ toFloat: 'Doit etre un nombre valide' });
+     */
     self['setErrorLabels'] = function (errorLabels) {
         if ( typeof(errorLabels) != 'undefined') {
+            _labelAliasFill(errorLabels);
             local.errorLabels = merge(errorLabels, local.errorLabels)
         }
     }
@@ -10185,7 +10252,10 @@ function ValidatorPlugin(rules, data, formId, culture) {
     /**
      * XML Request - isGFFCtx only
      * */
-    var xhr         = null;
+    // #B175: no module-scope XHR anymore — send() creates a fresh LOCAL XHR
+    // per submit (see send()). The shared instance was the stale-handler
+    // replay vector: re-open()ing it fired the previous submit's handler.
+    // was: var xhr         = null;
     var xhrOptions  = {
         'url'               : '',
         'method'            : 'GET',
@@ -10643,6 +10713,29 @@ function ValidatorPlugin(rules, data, formId, culture) {
         return _live;
     };
 
+    /**
+     * #B178 — announcement text for a field's error container.
+     * The container renders one `<p>` per rule message; visually they stack as
+     * blocks, but `textContent` concatenates them with NO separator, so an
+     * aria-live announcement read multiple messages as one run-on string.
+     * Joins the per-message texts with '. ' instead; falls back to the raw
+     * `textContent` when the container has no `<p>` children.
+     * @inner
+     * @param {object} $err - the error-message container element
+     * @returns {string} announcement text
+     */
+    var getA11yAnnounceText = function($err) {
+        var $msgs = $err.getElementsByTagName('p');
+        if ( !$msgs.length ) {
+            return $err.textContent;
+        }
+        var parts = [];
+        for (var m = 0, mLen = $msgs.length; m < mLen; ++m) {
+            parts.push($msgs[m].textContent);
+        }
+        return parts.join('. ');
+    };
+
     /**
      * handleErrorsDisplay
      * Attention: if you are going to handle errors display by hand, set data to `null` to prevent Toolbar refresh with empty data
@@ -10820,9 +10913,14 @@ function ValidatorPlugin(rules, data, formId, culture) {
                 }
 
                 // injecting error messages
+                // #B178 — two rules can carry byte-identical message text (e.g. a
+                // coercion paired with its validator); render each distinct text once.
+                // Dev bookkeeping below still records every key.
+                var _renderedMsgs = {};
                 for (var e in errors[name]) {
 
-                    if (e != 'stack') { // ignore stack for display
+                    if (e != 'stack' && typeof(_renderedMsgs[ errors[name][e] ]) == 'undefined') { // ignore stack for display
+                        _renderedMsgs[ errors[name][e] ] = true;
                         $msg = document.createElement('p');
                         $msg.appendChild( document.createTextNode(errors[name][e]) );
                         $err.appendChild($msg);
@@ -10860,7 +10958,7 @@ function ValidatorPlugin(rules, data, formId, culture) {
                     && $err
                     && $el !== document.activeElement
                 ) {
-                    announceA11yError($form, $err.textContent);
+                    announceA11yError($form, getA11yAnnounceText($err));
                 }
 
             } else if (
@@ -10953,8 +11051,11 @@ function ValidatorPlugin(rules, data, formId, culture) {
                         //         rule: errorMsg
                         //     }
                         // }
+                        // #B178 — distinct-text dedup, parity with the first-error branch
+                        var _renderedMsgs = {};
                         for (var e in errors[name]) {
-                            if (e != 'stack') { // ignore stack for display (parity with the first-error branch, #B89)
+                            if (e != 'stack' && typeof(_renderedMsgs[ errors[name][e] ]) == 'undefined') { // ignore stack for display (parity with the first-error branch, #B89)
+                                _renderedMsgs[ errors[name][e] ] = true;
                                 $msg = document.createElement('p');
                                 $msg.appendChild( document.createTextNode(errors[name][e]) );
                                 $err.appendChild($msg);
@@ -10995,7 +11096,7 @@ function ValidatorPlugin(rules, data, formId, culture) {
                     && $err
                     && $el !== document.activeElement
                 ) {
-                    announceA11yError($form, $err.textContent);
+                    announceA11yError($form, getA11yAnnounceText($err));
                 }
             }
 
@@ -11352,9 +11453,22 @@ function ValidatorPlugin(rules, data, formId, culture) {
         options.method  = method;
         options.url     = url;
 
-        if (!xhr) {
-            xhr = setupXhr(options);
-        }
+        // #B175: one XHR per send. The module-scope XHR (created once at
+        // validator init) was reused for every submit, and re-open()ing a
+        // completed XHR synchronously replays the PREVIOUS submit's
+        // still-assigned `onreadystatechange` handler (readyState 4 → 1):
+        // that stale closure re-disabled the PREVIOUS form's submit trigger
+        // and re-stamped its `data-gina-form-loading`, with no release path
+        // (its readyState-4 release never comes — the handler is replaced
+        // right below). A fresh LOCAL XHR per send makes handler, state and
+        // lifecycle per-submit; nested handlers close over this local, never
+        // the module var (the file-removal path already does exactly this
+        // with `let xhr = setupXhr(...)`).
+        // was:
+        // if (!xhr) {
+        //     xhr = setupXhr(options);
+        // }
+        var xhr = setupXhr();
 
         // to upload, use `multipart/form-data` for `enctype`
         var enctype = $target.getAttribute('enctype') || options.headers['Content-Type'];
@@ -11417,6 +11531,26 @@ function ValidatorPlugin(rules, data, formId, culture) {
         }
 
         if (xhr) {
+            // #B175 fail-safe release: `loadend` fires on success, error,
+            // timeout and abort alike — the lock armed below (submit trigger
+            // disabled + `data-gina-form-loading`) must never outlive its
+            // request. Idempotent with the readyState-4 release; one listener
+            // per XHR (fresh per send), so nothing accumulates.
+            if ( typeof(xhr.addEventListener) == 'function' ) {
+                xhr.addEventListener('loadend', function onSendSettled() {
+                    $form.isSending = false;
+                    $form.sent = false;
+                    if ($submitTrigger) {
+                        // For A tag: aria-disabled=true
+                        if ( /^A$/i.test($submitTrigger.tagName) ) {
+                            $submitTrigger.removeAttribute('aria-disabled');
+                        } else {
+                            $submitTrigger.removeAttribute('disabled');
+                        }
+                    }
+                    $form.target.removeAttribute('data-gina-form-loading');
+                });
+            }
             // catching ready state cb
             // Data loading ...
             if ( /^(1|3)$/.test(xhr.readyState) ) {
@@ -11433,7 +11567,13 @@ function ValidatorPlugin(rules, data, formId, culture) {
             //handleXhrResponse(xhr, $target, id, $form, hFormIsRequired);
             xhr.onreadystatechange = function onValidationCallback(event) {
                 $form.isSubmitting = false;
-                $form.isSending = false;
+                // #B175: `isSending` is no longer cleared here — this handler
+                // first fires at readyState 1 (synchronously at open()), so an
+                // early clear made the flag false for almost the whole request
+                // while its name promises "a request is in flight". It now
+                // spans send() → settled: cleared in the readyState-4 release
+                // below and in the `loadend` fail-safe above.
+                // was: $form.isSending = false;
 
                 // limit send trigger to 1 sec to prevent from double clicks
                 // setTimeout( function onSent() {
@@ -11467,6 +11607,7 @@ function ValidatorPlugin(rules, data, formId, culture) {
                 if (xhr.readyState == 4) {
 
                     $form.sent = false;
+                    $form.isSending = false; // #B175 — see the note at the handler top
                     if ($submitTrigger) {
                         // For A tag: aria-disabled=true
                         if ( /^A$/i.test($submitTrigger.tagName) ) {
@@ -12070,7 +12211,11 @@ function ValidatorPlugin(rules, data, formId, culture) {
 
                 $form.eventData.ontimeout = result;
 
-                $form.target.setAttribute('data-gina-form-loading', false);
+                // #B175: remove the attribute — `setAttribute(..., false)`
+                // wrote the string "false", which is attribute-PRESENT and
+                // truthy for any presence or non-empty-string check.
+                // was: $form.target.setAttribute('data-gina-form-loading', false);
+                $form.target.removeAttribute('data-gina-form-loading');
 
                 // intercept upload
                 if ( /^gina\-upload/i.test(id) ) {
@@ -13646,19 +13791,24 @@ function ValidatorPlugin(rules, data, formId, culture) {
                 }
 
 
-                // setting up AJAX
-                if (window.XMLHttpRequest) { // Mozilla, Safari, ...
-                    xhr = new XMLHttpRequest();
-                } else if (window.ActiveXObject) { // IE
-                    try {
-                        xhr = new ActiveXObject("Msxml2.XMLHTTP");
-                    } catch (e) {
-                        try {
-                            xhr = new ActiveXObject("Microsoft.XMLHTTP");
-                        }
-                        catch (e) {}
-                    }
-                }
+                // #B175: no init-time XHR — send() creates a fresh local XHR
+                // per submit (setupXhr() carries the same browser fallbacks).
+                // This block was the source of the shared instance every
+                // submit then reused.
+                // was:
+                // // setting up AJAX
+                // if (window.XMLHttpRequest) { // Mozilla, Safari, ...
+                //     xhr = new XMLHttpRequest();
+                // } else if (window.ActiveXObject) { // IE
+                //     try {
+                //         xhr = new ActiveXObject("Msxml2.XMLHTTP");
+                //     } catch (e) {
+                //         try {
+                //             xhr = new ActiveXObject("Microsoft.XMLHTTP");
+                //         }
+                //         catch (e) {}
+                //     }
+                // }
 
 
 
@@ -16190,8 +16340,19 @@ function ValidatorPlugin(rules, data, formId, culture) {
         var updateSelect = function($el, $form) {
             $el.setAttribute('data-value', $el.value);
             // If Live check enabled, proceed to silent validation
+            // #B176: the `&&` used to sit INSIDE test() — an explicit
+            // `data-gina-form-live-check-enabled="false"` (a truthy string)
+            // short-circuited to the rules-count boolean, which stringifies
+            // to "true" and matched, so THIS gate ignored the opt-out.
+            // Scope (measured at the fix's parent): only this gate and the
+            // bindForm silent-validation gate were defective. The three
+            // registerForLiveChecking sites already tested the attribute
+            // alone, so an opted-out form never got text as-you-type — the
+            // pre-fix behaviour was an incoherent middle, not a wholesale
+            // ignore. Do not restate this as "the opt-out did nothing".
+            // was: /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled && $form.rules.count() > 0)
             if (
-                /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled && $form.rules.count() > 0)
+                /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled) && $form.rules.count() > 0
                 // && typeof($form.isBeingReseted) == 'undefined'
             ) {
                 var localField = {}, $localField = {}, $localForm = null;
@@ -17493,7 +17654,16 @@ function ValidatorPlugin(rules, data, formId, culture) {
 
         instance.$forms[_id]['binded']  = true;
         // If Live check enabled, proceed to silent validation
-        if ( /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled && $form.rules.count() > 0) ) {
+        // #B176: same inside-test() `&&` defect as the change-handler gate —
+        // an explicit "false" opt-out still ran THIS bind-time silent
+        // validation pass (it did NOT enable text as-you-type; the three
+        // registerForLiveChecking sites were already strict). Note this gate
+        // also swallowed the `else if` below, which exists precisely to serve
+        // the opted-out case: the trigger still ended enabled either way,
+        // because updateSubmitTriggerState forces its show branch when
+        // live-check is off. See the scope note at the sibling site.
+        // was: if ( /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled && $form.rules.count() > 0) ) {
+        if ( /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled) && $form.rules.count() > 0 ) {
             console.debug('silent validation mode on');
             var validationInfo  = getFormValidationInfos($form.target, $form.rules);
             var fields          = validationInfo.fields;
@@ -17526,7 +17696,7 @@ function ValidatorPlugin(rules, data, formId, culture) {
 
     var updateSubmitTriggerState = function($formInstanceOrTarget, isFormValid) {
         //console.debug('submitTrigger[isFormValid='+ isFormValid +']: ', $formInstance.submitTrigger)
-        $formInstance = null;
+        var $formInstance = null; // #B176: was an implicit global (undeclared assignment)
         if ( $formInstanceOrTarget instanceof HTMLFormElement ) { //  is target DOMobject
             var id = $formInstanceOrTarget.getAttribute('id');
             $formInstance =  instance.$forms[id];