gina 0.1.6-alpha.9 → 0.1.6-alpha.90

package/framework/{v0.1.6-alpha.9 → v0.1.6-alpha.90}/core/plugins/lib/validator/src/main.js

@@ -18,7 +18,7 @@
  * @param {object} [ data ] // from request
  * @param {string} [ formId ]
  * */
- function ValidatorPlugin(rules, data, formId) {
+function ValidatorPlugin(rules, data, formId) {
 
     this.plugin = 'validator';
 
@@ -128,6 +128,7 @@
         'eventData'             : {},
         'target'                : (isGFFCtx) ? document : null, // by default
         'cachedErrors'          : {},
+        'lastFocused'           : (isGFFCtx) ? [] : null,
         'binded'                : false,
         'unbinded'              : false,
         'withUserBindings'      : false,
@@ -408,22 +409,34 @@
     }
 
     var refreshWarning = function($el) {
-        var formId = $el.form.getAttribute('id');
+        var formId = $el.form.id || $el.form.getAttribute('id');
+        var elName = $el.name || $el.form.getAttribute('name');
+        var currentElName = document.activeElement.name;
         if ( /^true$/i.test(instance.$forms[formId].isValidating) ) {
             return;
         }
 
-        var $parent = $el.parentNode, isErrorMessageHidden = false;
-        var $children = $parent.getElementsByTagName('div');
+        var $parent                 = $el.parentNode
+            , isErrorMessageHidden  = false
+            ,  $children            = $parent.getElementsByTagName('div')
+        ;
 
-        if ( /form\-item\-warning/.test($parent.className) ) {
+        if ( /form\-item\-warning/.test($parent.className) && currentElName != elName ) {
             $parent.className = $parent.className.replace(/form\-item\-warning/, 'form-item-error');
 
-        } else if (/form\-item\-error/.test($parent.className) ) {
+        } else if (/form\-item\-error/.test($parent.className) && currentElName == elName ) {
             $parent.className = $parent.className.replace(/form\-item\-error/, 'form-item-warning');
             isErrorMessageHidden = true;
         }
 
+        // Fixed on 2025-03-16
+        if (
+            /^true$/i.test(instance.$forms[formId].isValidating)
+            && !isErrorMessageHidden
+        ) {
+            return;
+        }
+
 
         for (var c = 0, cLen = $children.length; c<cLen; ++c) {
             if ( /form\-item\-error\-message/.test($children[c].className) ) {
@@ -445,7 +458,7 @@
      * @param {object} $form - Target (HTMLFormElement)
      * @param {object} errors
      * @param {object|null} data
-     * @param {object|null} [fileName]
+     * @param {string|null} [fileName]
      */
     var liveCheckErrors = {}; // Per Form & Per Element
     var handleErrorsDisplay = function($form, errors, data, fieldName) {
@@ -476,7 +489,7 @@
                 if ( typeof(liveCheckErrors[formId]) == 'undefined') {
                     liveCheckErrors[formId] = {};
                 }
-                if (errors.count() > 0) {
+                if (errors && errors.count() > 0) {
                     // reset field name
                     liveCheckErrors[formId][fieldName] = {};
                     // override
@@ -486,8 +499,29 @@
                     }
                     errors = liveCheckErrors[formId];
                     // only if the form has not been sent yet
-                    if (!instance.$forms[formId].sent || instance.$forms[formId].isValidating) {
+                    if (
+                        !instance.$forms[formId].sent
+                        ||
+                        instance.$forms[formId].isValidating
+                    ) {
                         isWarning = true;
+                        // Fixed on 2025-03-16
+                        var lastFocused = instance.$forms[formId].lastFocused;
+                        // console.debug('fieldName: '+ fieldName + '\nactiveElement: '+ document.activeElement.getAttribute('name') +'\nlastFocused: ', lastFocused);
+                        if (
+                            lastFocused.length > 0
+                                && typeof(lastFocused[1]) != 'undefined'
+                                && lastFocused[1].name == fieldName
+                            ||
+                            lastFocused.length > 0
+                                && !lastFocused[1]
+                                && document.activeElement.getAttribute('name') != lastFocused[0].name
+                            ||
+                            document.activeElement.getAttribute('name') != fieldName
+                        ) {
+                            isWarning = false;
+                        }
+                        // console.debug('isWarning: '+isWarning);
                     }
                 } else {
                     if ( typeof(liveCheckErrors[formId][fieldName]) != 'undefined') {
@@ -551,7 +585,11 @@
 
             if (!name) continue;
 
-            if ( typeof(errors[name]) != 'undefined' && !/(form\-item\-error|form\-item\-warning)/.test($parent.className) ) {
+            if (
+                errors
+                && typeof(errors[name]) != 'undefined'
+                && !/(form\-item\-error|form\-item\-warning)/.test($parent.className)
+            ) {
 
                 if (isWarning) {
                     // adding warning class
@@ -592,7 +630,24 @@
 
 
 
-            } else if ( typeof(errors[name]) == 'undefined' && /(form\-item\-error|form\-item\-warning)/.test($parent.className) || typeof(errors[name]) != 'undefined' && errors[name].count() == 0 && /(form\-item\-error|form\-item\-warning)/.test($parent.className) ) {
+            } else if (
+                errors
+                    && typeof(errors[name]) == 'undefined'
+                    && /(form\-item\-error|form\-item\-warning)/.test($parent.className)
+                ||
+                errors
+                    && typeof(errors[name]) != 'undefined' && errors[name].count() == 0
+                    && /(form\-item\-error|form\-item\-warning)/.test($parent.className)
+            ) {
+                // Fixed on 2025-03-10
+                // targeted field must be the active element
+                // if (
+                //     document.activeElement.getAttribute('name') != fieldName
+                //     && errors.count() > 0
+                // ) {
+                //     break
+                // }
+                console.debug('[handleErrorsDisplay] Resetting when not in error');
                 // reset when not in error
                 // remove child elements
                 var $children = $parent.getElementsByTagName('div');
@@ -606,16 +661,34 @@
 
                 $parent.className = $parent.className.replace(/(\s+form\-item\-error|form\-item\-error|\s+form\-item\-warning|form\-item\-warning)/, '');
 
-            } else if ( typeof(errors[name]) != 'undefined' && errAttr) {
+            } else if (
+                errors.count() > 0
+                && typeof(errors[name]) != 'undefined'
+                && errAttr
+            ) {
                 // refreshing already displayed error on msg update
                 var $divs = $parent.getElementsByTagName('div');
                 for (var d = 0, dLen = $divs.length; d<dLen; ++d) {
-                    if ($divs[d].className == 'form-item-error-message') {
+                    // Fixed on 2025-03-05: className can have more than one !!
+                    let foundMessage = $divs[d].className.match("form-item-error-message");
+                    if (
+                        foundMessage
+                        && typeof(foundMessage.length) != 'undefined'
+                        && foundMessage.length > 0
+                    ) {
 
                         $divs[d].parentElement.removeChild($divs[d]);
                         $err = document.createElement('div');
                         $err.setAttribute('class', 'form-item-error-message');
 
+                        // Fixed on 2025-03-09: className cleanup
+                        if (
+                            !isWarning
+                            && /(\s+form\-item\-warning|form\-item\-warning)/.test($parent.className)
+                        ) {
+                            $parent.className = $parent.className.replace(/(\s+form\-item\-warning|form\-item\-warning)/, ' form-item-error');
+                        }
+
                         // injecting error messages
                         // {
                         //     field: {
@@ -640,12 +713,17 @@
                     }
                 }
 
-                if ($err && $target.type != 'hidden')
+                if ($err && $target.type != 'hidden') {
                     insertAfter($target, $err);
-
+                }
             }
 
-            if (typeof(fieldName) != 'undefined' && fieldName === $el.name) break;
+            if (
+                typeof(fieldName) != 'undefined'
+                && fieldName === $el.name
+            ) {
+                break;
+            }
         }
 
 
@@ -981,7 +1059,8 @@
                 // In case the user is also redirecting
                 var redirectDelay = (/Google Inc/i.test(navigator.vendor)) ? 50 : 0;
 
-                if (xhr.readyState == 2) { // responseType interception
+                // responseType interception
+                if (xhr.readyState == 2) {
                     isAttachment    = ( /^attachment\;/.test( xhr.getResponseHeader("Content-Disposition") ) ) ? true : false;
                     // force blob response type
                     if ( !xhr.responseType && isAttachment ) {
@@ -1015,7 +1094,7 @@
                                 var url = window.URL.createObjectURL(blob);
                                 a.href = url;
                                 var contentDisposition = xhr.getResponseHeader("Content-Disposition");
-                                a.download = contentDisposition.match('\=(.*)')[0].substr(1);
+                                a.download = contentDisposition.match('\=(.*)')[0].substring(1);
                                 //programatically click the link to trigger the download
                                 a.click();
 
@@ -1034,7 +1113,9 @@
                                     size : blob.size
                                 }
 
-                            } else { // normal case
+                            }
+                            // normal case
+                            else {
                                 result = xhr.responseText;
                             }
 
@@ -1043,9 +1124,14 @@
                             if ( /\/json/.test( contentType ) ) {
                                 result = JSON.parse(xhr.responseText);
 
-                                if ( typeof(result.status) == 'undefined' )
+                                if ( typeof(result.status) == 'undefined' ) {
                                     result.status = xhr.status;
-
+                                }
+                                // Fixed on 2025-03-13 Allowing toolbar to ubdate after xhr results
+                                // TODO - Allowing to revert to previously loaded data via a close button
+                                if (gina && envIsDev && typeof(window.ginaToolbar) && typeof(result) != 'undefined') {
+                                    window.ginaToolbar.update('data-xhr', result);
+                                }
                             }
 
                             if ( /\/html/.test( contentType ) ) {
@@ -1276,6 +1362,13 @@
                             // } else { // external - need to remove `X-Requested-With` from `options.headers`
                                 result.location = (!/^http/.test(result.location) && !/^\//.test(result.location) ) ? location.protocol +'//' + result.location : result.location;
                             //}
+                            // isProxyHost ?
+                            if (
+                                result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:\/\//, '').split(/\//g)[0] == gina.config.hostname
+                                && gina.config.hostname == window.location.host
+                            ) {
+                                result.location = location.protocol  + result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:/, '')
+                            }
 
                             return setTimeout(() => {
                                 window.location.href = result.location;
@@ -1905,7 +1998,7 @@
                         filesToBeRemoved.push(childNodeFilePreview);
                     }
                 } else {
-                    let file = childNodes[i].src.substr(childNodes[i].src.lastIndexOf('/')+1);
+                    let file = childNodes[i].src.substring(childNodes[i].src.lastIndexOf('/')+1);
                     childNodeFile = file;
                     filesToBeRemoved.push(childNodeFile);
                 }
@@ -2341,7 +2434,7 @@
                     for (let m = 0, mLen = mergingRules.length; m < mLen; m++) {
                         if ( re.test(mergingRules[m]) ) {
                             let tmpStr = JSON.stringify(rule);
-                            tmpStr = tmpStr.substr(1, tmpStr.length-1);// removing ->{ ... }<-
+                            tmpStr = tmpStr.substring(1, tmpStr.length-1);// removing ->{ ... }<-
                             // is last ?
                             if (m < mLen-1) {
                                 tmpStr += ','
@@ -3126,7 +3219,6 @@
                                 } else {
                                     handleErrorsDisplay(event.target.form, errors, null, event.target.name);
                                 }
-                                //return cancelEvent(event);
                             }
 
 
@@ -3136,7 +3228,7 @@
 
                             instance.$forms[event.target.form.getAttribute('id')].isValidating = true;
                             validate(event.target, localField, $localField, $form.rules, function onLiveValidation(result){
-                                instance.$forms[event.target.form.getAttribute('id')].isValidating = false;
+                                // instance.$forms[event.target.form.getAttribute('id')].isValidating = false;
                                 //console.debug('validation on processEvent(...) ', result);
 
                                 var isFormValid = result.isValid();
@@ -3162,8 +3254,10 @@
                                 instance.$forms[formId].isValidating = true;
                                 validate($gForm, gFields, $gFields, gRules, function onSilentGlobalLiveValidation(gResult){
                                     instance.$forms[formId].isValidating = false;
-                                    console.debug('['+ formId +'] onSilentGlobalLiveValidation: '+ gResult.isValid(), gResult);
+                                    console.debug('['+ formId +'] onSilentGlobalLiveValidation: '+ gResult.isValid(), gResult, gFields);
+                                    // var isFormValid = ( gResult.isValid() && instance.$forms[formId].errors && instance.$forms[formId].errors.count() == 0 )? true : false;
                                     var isFormValid = gResult.isValid();
+                                    // var isFormValid = gResult.isValid();
                                     if ( envIsDev && isGFFCtx && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
                                         // update toolbar
                                         if (!gina.forms.errors)
@@ -3178,6 +3272,27 @@
                                     }
 
 
+                                    if ( !isFormValid && gResult.error ) {
+                                        // Fixed on 2025-03-16 - we need past and live errors
+                                        instance.$forms[ $el.form.getAttribute('id') ].errors = merge(result.error, gResult.error);
+                                        // Fixed on 2025-03-16
+                                        for (let eField in gResult.error) {
+                                            refreshWarning($gFields[eField]);
+                                            handleErrorsDisplay($gForm, gResult.error, gResult.data, eField);
+                                        }
+                                    }
+                                    // Fixed on 2025-03-16
+                                    // Eg.: input select change impacting another element: solve `no more errors`
+                                    else if ( instance.$forms[formId].errors && !instance.$forms[formId].errors.count() ) {
+                                        // recheck if valid
+                                         //resetting error display
+                                         instance.$forms[ formId ].errors = {};
+                                         console.debug('resetting field: '+ $el.name);
+                                         liveCheckErrors[formId] = {};
+                                        //  $form.dataset.ginaFormIsResetting = true;
+                                         handleErrorsDisplay($gForm, {}, null, $el.name);
+                                    }
+
                                     updateSubmitTriggerState( $gForm, isFormValid);
 
                                     once = false;
@@ -3211,13 +3326,16 @@
                         // other inputs & textareas
                         else if ( /^focusin\./i.test(event.type) ) {
                             if ( /\-error/.test($el.parentNode.className) ) {
-                                console.debug('#1 you just focusin ....'+$el.id, $el.value);
+                                console.debug('#1 you just focusin ....'+$el.id, $el.value, instance.$forms[ $el.form.getAttribute('id') ].isValidating);
                                 refreshWarning($el);
                             }
                         }
                         else if ( /^focusout\./i.test(event.type) ) {
                             if ( /\-warning/.test($el.parentNode.className) ) {
                                 console.debug('#1 you just focusout ....'+$el.id, $el.value);
+                                // Removed on 2025-03-16
+                                instance.$forms[ $el.form.getAttribute('id') ].isValidating = false;
+
                                 refreshWarning($el);
                                 // in case error context is changed by another task
                                 handleErrorsDisplay($el.form, instance.$forms[ $el.form.getAttribute('id') ].errors, null, $el.name);
@@ -3226,12 +3344,86 @@
                         else if ( /^keyup\./i.test(event.type) ) {
                             $el.ginaFormValidatorTestedValue = $el.value;
                             liveCheckTimer = setTimeout( function onLiveCheckTimer() {
-                                // do not trigger for copy/paste event
-                                if ( ['91', '17'].indexOf(''+event.keyCode) > -1  && keyboardMapping.count() == 0) {
+                                // Do not trigger for copy/paste event
+                                if ( ['91', '17', '16'].indexOf(''+event.keyCode) > -1  && keyboardMapping.count() == 0) {
                                     //console.debug('mapping ', keyboardMapping);
                                     return;
                                 }
-                                console.debug(' keyup ('+ event.keyCode +') .... '+$el.id, $el.value, ' VS ',$el.ginaFormValidatorTestedValue + '(old)');
+
+                                // Fixed on 2025-03-16:
+                                // Treat TAB as focus in/out
+                                // if ( ['9'].indexOf(''+event.keyCode) > -1 ) {
+
+                                //     console.debug('[TAB] you just focusout from "'+ instance.$forms[ $el.form.getAttribute('id') ].lastFocused[1].id +'" to "'+ $el.id +'"');
+                                //     var $gForm = event.target.form, gFields = null, $gFields = null, gRules = null;
+                                //     var gValidatorInfos = getFormValidationInfos($gForm, rules);
+                                //     gFields  = gValidatorInfos.fields;
+                                //     $gFields = gValidatorInfos.$fields;
+                                //     var formId = $gForm.getAttribute('id');
+                                //     gRules   = instance.$forms[formId].rules;
+                                //     // Don't be tempted to revome fields that has already been validated
+                                //     instance.$forms[formId].isValidating = true;
+                                //     validate($gForm, gFields, $gFields, gRules, function onSilentGlobalLiveValidation(gResult){
+                                //         instance.$forms[formId].isValidating = false;
+                                //         console.debug('['+ formId +'] [9] onSilentGlobalLiveValidation: '+ gResult.isValid(), gResult, gFields);
+                                //         var isFormValid = ( gResult.isValid() && instance.$forms[formId].errors && instance.$forms[formId].errors.count() == 0 )? true : false;
+                                //         // var isFormValid = gResult.isValid();
+                                //         if ( envIsDev && isGFFCtx && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
+                                //             // update toolbar
+                                //             if (!gina.forms.errors)
+                                //                 gina.forms.errors = {};
+
+                                //             var objCallback = {
+                                //                 id      : formId,
+                                //                 errors  :  gResult.error || {}
+                                //             };
+
+                                //             window.ginaToolbar.update('forms', objCallback);
+                                //         }
+
+
+                                //         if ( !isFormValid && gResult.error ) {
+                                //             // Fixed on 2025-03-16 - we need past and live errors
+                                //             instance.$forms[ $el.form.getAttribute('id') ].errors = merge(result.error, gResult.error);
+                                //             // Fixed on 2025-03-16
+                                //             for (let eField in instance.$forms[ $el.form.getAttribute('id') ].errors) {
+                                //                 refreshWarning($gFields[eField]);
+                                //                 handleErrorsDisplay($gForm, instance.$forms[ $el.form.getAttribute('id') ].errors, gResult.data, eField);
+                                //             }
+                                //         }
+                                //         // Fixed on 2025-03-16
+                                //         // Eg.: input select change impacting another element: solve `no more errors`
+                                //         else if ( instance.$forms[formId].errors && !instance.$forms[formId].errors.count() ) {
+                                //             // recheck if valid
+                                //              //resetting error display
+                                //              instance.$forms[ formId ].errors = {};
+                                //              console.debug('resetting field: '+ $el.name);
+                                //              liveCheckErrors[formId] = {};
+                                //             //  $form.dataset.ginaFormIsResetting = true;
+                                //              handleErrorsDisplay($gForm, {}, null, $el.name);
+                                //         }
+
+                                //         updateSubmitTriggerState( $gForm, isFormValid);
+
+                                //         once = false;
+                                //     });
+                                //     // var $previeousEl = document.getElementById(instance.$forms[ $el.form.getAttribute('id') ].lastFocused[1].id);
+                                //     // var errors = instance.$forms[ $previeousEl.form.getAttribute('id') ].errors;
+                                //     // var isFormValid = (!errors[$previeousEl.name]) ? true : false;
+                                //     // console.debug('[TAB] you just focusout from "'+ instance.$forms[ $el.form.getAttribute('id') ].lastFocused[1].id +'" to "'+ $el.id +'"', "errors: ", errors);
+                                //     // if (errors && errors.count() > 0 ) {
+                                //     //     instance.$forms[ $previeousEl.form.getAttribute('id') ].isValidating = false;
+                                //     //     isFormValid = false;
+                                //     // }
+                                //     // refreshWarning($previeousEl);
+                                //     // // // in case error context is changed by another task
+                                //     // handleErrorsDisplay($previeousEl.form, errors, null, $previeousEl.name);
+                                //     // updateSubmitTriggerState( $el.form, isFormValid);
+                                //     return;
+                                // }
+
+
+                                console.debug('[A]['+keyboardMapping.count()+'] keyup ('+ event.keyCode +') .... '+$el.id, $el.value, ' VS ',$el.ginaFormValidatorTestedValue + '(old)');
                                 processEvent();
                             }, 1000);
                         }
@@ -3333,14 +3525,14 @@
                         case 46: //Delete
                         case 8: //Backspace
                             if (posStart != posEnd) {
-                                $_el.value = str.substr(0, posStart) + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart) + str.substring(posEnd);
                                 if (posStart == 0) {
-                                    $_el.value = str.substr(posEnd);
+                                    $_el.value = str.substring(posEnd);
                                 }
                             } else if (posStart == 0) {
                                 $_el.value = str.substring(posStart+1);
                             } else {
-                                $_el.value = str.substr(0, posStart-1) + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart-1) + str.substring(posEnd);
                             }
 
                             e.currentTarget.setAttribute('readonly', 'readonly');
@@ -3428,14 +3620,14 @@
                         default:
                             // Replace selection
                             if (posStart != posEnd) {
-                                $_el.value = str.substr(0, posStart) + e.key;
+                                $_el.value = str.substring(0, posStart) + e.key;
                                 if (posEnd-1 < str.length) {
                                     $_el.value += str.substring(posEnd)
                                 }
                             } else if (posStart == 0) {
                                 $_el.value = e.key + str.substring(posStart);
                             } else {
-                                $_el.value = str.substr(0, posStart) + e.key + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart) + e.key + str.substring(posEnd);
                             }
                             e.currentTarget.setAttribute('readonly', 'readonly');
                             // Force restore last caret position
@@ -3577,24 +3769,53 @@
     }
 
     /**
-     * reBindForm - This is a WIP
+     * reBindForm
+     * Allows form rebinding: it is like reseting validation
      *
-     * @param {object} HTMLElement
-     * @param {object} rules
-     * @returns {object} formValidatorInstance
+     * E.g.:
+     * $validator
+     *    .getFormById('my-form-id')
+     *    .reBind();
+     *
+     * @param {string} [formId]
+     * @param {string} [rules]
+     * @param {callback} [cb]
      */
-    var reBindForm = function($target, rules, cb) {
-        // Unbind form
-        var formInstance = unbindForm($target);
+    var reBindForm = function(formId, rules, cb) {
+        var $form   = null
+            , _id   = null
+        ;
+        if (
+            typeof(this.target) != 'undefined'
+            && /FORM/i.test(this.target.tagName)
+        ) {
+            _id = formId = this.target.getAttribute('id')
+        } else if ( /string/i.test(typeof(formId)) ) {
+            _id = formId
+        }
+
+        if ( typeof(instance.$forms[_id]) != 'undefined') {
+            $form = instance.$forms[_id];
+        } else {
+            throw new Error('form instance `'+ _id +'` not found');
+        }
+
         // reset errors
-        //resetErrorsDisplay(formInstance.id);
+        resetErrorsDisplay(_id);
+        // Unbind form
+        unbindForm($form.target);
         // Bind
-        bindForm(formInstance.target, rules);
+        if ( typeof(rule) != 'undefined' ) {
+            bindForm($form.target, rules);
+        } else {
+            bindForm($form.target);
+        }
 
         if ( cb ) {
-            return cb(formInstance);
+            return cb($form);
         }
-        return formInstance;
+
+        return $form;
     }
 
     var unbindForm = function($target) {
@@ -3612,7 +3833,7 @@
 
             } else if ( typeof($target.target) != 'undefined' ) {
                 $form = $target;
-                _id = $form.id;
+                _id = ( $target.getAttribute && $target.getAttribute('id') ) ? $form.getAttribute('id') : $form.id;
             } else {
                 throw new Error('Validator::unbindForm($target): `$target` must be a DOM element\n'+err.stack )
             }
@@ -3651,7 +3872,7 @@
         // submit buttons
         $elTMP = $form.target.getElementsByTagName('button');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 // if button is != type="submit", you will need to provide : data-gina-form-submit
                 // TODO - On button binding, you can then provide data-gina-form-action & data-gina-form-method
                 $els.push($elTMP[i])
@@ -3661,7 +3882,7 @@
         // submit links
         $elTMP = $form.target.getElementsByTagName('a');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 $els.push($elTMP[i])
             }
         }
@@ -3717,7 +3938,7 @@
         // textarea
         $elTMP = $form.target.getElementsByTagName('textarea');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 $els.push( $elTMP[i] )
             }
         }
@@ -3726,7 +3947,7 @@
         // forms inside main form
         $elTMP = $form.target.getElementsByTagName('form');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 $els.push( $elTMP[i] )
             }
         }
@@ -3811,8 +4032,10 @@
     /**
      * bindForm
      *
-     * @param {object} $target - DOM element
-     * @param {object} [customRule]
+     * @param {object} [$target] - DOM element
+     * @param {object|string} [customRule]
+     *
+     * @return {object} bindedForm
      * */
     var bindForm = function($target, customRule) {
 
@@ -3821,23 +4044,32 @@
             , rules = ( typeof(local.rules.count() > 0 ) ) ? local.rules : instance.rules
         ;
 
-        try {
-            if ( $target.getAttribute && $target.getAttribute('id') ) {
-                _id = $target.getAttribute('id');
-                if ( typeof(instance.$forms[_id]) != 'undefined')
-                    $form = instance.$forms[_id];
-                else
-                    throw new Error('form instance `'+ _id +'` not found');
+        if (
+            typeof($target) == 'undefined'
+            && typeof(this.target) != 'undefined'
+            && /FORM/i.test(this.target.tagName)
+            ||
+            !/object/i.test( typeof($target) )
+        ) {
+            _id = this.target.id || this.target.getAttribute('id');
+        } else if ( /string/i.test(typeof($target)) ) {
+            _id = $target
+        } else {
+            _id = $target.getAttribute('id')
+        }
 
+        try {
+            if ( typeof(instance.$forms[_id]) != 'undefined') {
+                $form = instance.$forms[_id];
+                if ( typeof($form.target) == 'undefined' ) {
+                    throw new Error('Validator::bindForm($target, customRule): `$target` must be a DOM element\n');
+                }
+                $target = $form.target;
             } else {
-                throw new Error('Validator::bindForm($target, customRule): `$target` must be a DOM element\n'+err.stack )
+                throw new Error('form instance `'+ _id +'` not found');
             }
         } catch(err) {
-            throw new Error('Validator::bindForm($target, customRule) could not bind form `'+ $target +'`\n'+err.stack )
-        }
-
-        if ( typeof($form) != 'undefined' && $form.binded) {
-            return false
+            throw new Error('Validator::bindForm($target, customRule) could not bind form `'+ $target +'`\n'+err.stack );
         }
 
         console.debug('binding for: '+ _id);
@@ -4143,7 +4375,7 @@
                         } else if ( /img/i.test($els[i].tagName) ) {
                             $img = $els[i];
                             deleteLinkId = uploadTriggerId + '-'+index+'-delete-trigger';
-                            let file = $img.src.substr($img.src.lastIndexOf('/')+1);
+                            let file = $img.src.substring($img.src.lastIndexOf('/')+1);
                             $uploadTrigger.customFiles.push({
                                 name: file,
                                 deleteLinkId: deleteLinkId
@@ -4535,7 +4767,16 @@
                     validate($gForm, gFields, $gFields, gRules, function onSilentGlobalLiveValidation(gResult){
                         instance.$forms[formId].isValidating = false;
                         console.debug('[updateSelect]: onSilentGlobalLiveValidation: '+ gResult.isValid(), gResult);
+                        // Fixed on 2025-03-16
                         var isFormValid = gResult.isValid();
+                        if (!isFormValid) {
+                            instance.$forms[formId].errors = gResult.error;
+                            for (let eField in gResult.error) {
+                                // refreshWarning($gFields[eField]);
+                                handleErrorsDisplay($gForm, gResult.error, gResult.data, eField);
+                            }
+                        }
+
                         updateSubmitTriggerState( $gForm, isFormValid);
                         once = false;
                     })
@@ -5129,6 +5370,25 @@
                 if (gina.events[_evt]) {
                     cancelEvent(event);
 
+                    // Fixed on 2025-03-05 - "last focus" vs "current focus"
+                    // To get active element: document.activeElement
+                    var formId      = event.target.form.getAttribute('id') || event.currentTarget.getAttribute('id');
+                    var lastFocused = {
+                        id  : $el.id,
+                        name: $el.name
+                    };
+                    if (!instance.$forms[formId].lastFocused.length) {
+                        instance.$forms[formId].lastFocused[0] = lastFocused;
+                    } else {
+                        instance.$forms[formId].lastFocused.splice(0,0,lastFocused);
+                    }
+                    lastFocused = ( typeof(instance.$forms[formId].lastFocused[1]) != 'undefined' ) ? instance.$forms[formId].lastFocused[1].id : null;
+
+                    // cleanup
+                    instance.$forms[formId].lastFocused.splice(2);
+
+                    // console.debug('lastFocused: ', lastFocused, ' VS current: ', $el.id);
+
                     triggerEvent(gina, $el, _evt, event.detail);
                 }
             });
@@ -5445,7 +5705,7 @@
         ;
         $buttonsTMP = $target.getElementsByTagName('button');
         if ( $buttonsTMP.length > 0 ) {
-            for(let b = 0, len = $buttonsTMP.length; b < len; ++b) {
+            for (let b = 0, len = $buttonsTMP.length; b < len; ++b) {
                 if ($buttonsTMP[b].type == 'submit') {
                     $buttons.push($buttonsTMP[b])
                 }
@@ -5455,7 +5715,7 @@
         // binding links
         $buttonsTMP = $target.getElementsByTagName('a');
         if ( $buttonsTMP.length > 0 ) {
-            for(let b = 0, len = $buttonsTMP.length; b < len; ++b) {
+            for (let b = 0, len = $buttonsTMP.length; b < len; ++b) {
                 if ( $buttonsTMP[b].attributes.getNamedItem('data-gina-form-submit') ) {
                     $buttons.push($buttonsTMP[b])
                 } else if (
@@ -5712,7 +5972,8 @@
                 }
                 updateSubmitTriggerState( $form, result.isValid() );
             });
-        } else if (!/^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled) ) {
+        }
+        else if (!/^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled) ) {
             updateSubmitTriggerState( $form , true );
         }
 
@@ -6175,7 +6436,8 @@
                                 if ( !/^form$/i.test($formOrElement.tagName) ) {
                                     $currentForm  = $formOrElement.form;
                                 }
-                                var formId = $currentForm.getAttribute('id');
+                                var formId      = $currentForm.getAttribute('id');
+                                var isFormValid = null;
 
                                 if (
                                     hasParsedAllRules
@@ -6196,10 +6458,16 @@
                                         if ( typeof(instance.$forms[formId].errors) == 'undefined' ) {
                                             instance.$forms[formId].errors = {}
                                         }
+                                        // Fixed on 2025-03-16
+                                        if ( typeof(cb._errors[field]) != 'undefined' ) {
+                                            instance.$forms[formId].errors[field] = cb._errors[field];
+                                        }
+                                        console.debug('[A] Refreshing warning/error on field '+ field);
+                                        if (
+                                            !isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating)
+                                            || d[field].target.value != ''
 
-                                        instance.$forms[formId].errors[field] = cb._errors[field];
-
-                                        if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating) || d[field].target.value != '' ) {
+                                        ) {
                                             refreshWarning($allFields[field]);
                                             handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
                                             updateSubmitTriggerState( $currentForm, isFormValid);
@@ -6207,8 +6475,9 @@
 
                                         if ( envIsDev && isGFFCtx && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
                                             // update toolbar
-                                            if (!gina.forms.errors)
+                                            if (!gina.forms.errors) {
                                                 gina.forms.errors = {};
+                                            }
 
                                             var objCallback = {
                                                 id      : formId,
@@ -6225,13 +6494,13 @@
                                 }
 
                                 // is this the last or the only field to be validated ?
-                                var needsGlobalReValidation = false, isFormValid = null;
+                                var needsGlobalReValidation = false;
                                 if ( listedFields.length == 1 || listedFields[listedFields.length-1] == field) {
                                     // trigger end of validation
                                     // console.debug(field +' is the last element to be validated for formId: '+ formId, cb._errors, instance.$forms[formId].errors);
                                     isFormValid = ( cb._errors.count() > 0 ) ? false : true;
                                     if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating)) {
-                                        //console.debug('should update error display now ', cb._errors);
+                                        console.debug('[1] Should update error display now ', cb._errors);
                                         instance.$forms[formId].errors = merge(cb._errors, instance.$forms[formId].errors);
                                         refreshWarning($allFields[field]);
                                         handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
@@ -6263,8 +6532,6 @@
                                             window.ginaToolbar.update('forms', objCallback);
                                         }
 
-
-
                                         handleErrorsDisplay($currentForm, gResult.error, gResult.data, field);
                                         updateSubmitTriggerState( $currentForm, isFormValid);
                                     })
@@ -6408,7 +6675,7 @@
 
                     for (var c in rules) {
                         if (!/^\_case\_/.test(c) ) continue;
-                        if ( typeof(rules[c].conditions) == 'undefined' || Array.isArray(rules[c].conditions) && !rules[c].conditions.length ) continue;
+                        if ( typeof(rules[c].conditions) == 'undefined' || Array.isArray(rules[c].conditions) && !rules[c].conditions.length ) continue;
                         if ( typeof(rules[c].conditions[0].rules) == 'undefined' ) continue;
 
 
@@ -6590,7 +6857,14 @@
                             // filtering conditions
                             for (var _c = 0, _cLen = rules[c].conditions.length; _c < _cLen; ++_c) {
 
-                                if (rules[c].conditions[_c].case != caseValue) {
+                                if (
+                                    Array.isArray(rules[c].conditions[_c].case)
+                                        && rules[c].conditions[_c].case.indexOf(caseValue) == -1
+                                    ||
+                                    !Array.isArray(rules[c].conditions[_c].case)
+                                        && rules[c].conditions[_c].case != caseValue
+
+                                ) {
                                     continue;
                                 }
 
@@ -6735,7 +7009,8 @@
                             if (
                                 conditions[c]['case'] === caseValue
                                 ||
-                                Array.isArray(conditions[c]['case']) && conditions[c]['case'].indexOf(caseValue) > -1
+                                Array.isArray(conditions[c]['case'])
+                                    && conditions[c]['case'].indexOf(caseValue) > -1
                                 ||
                                 /^\//.test(conditions[c]['case'])
                             ) {
@@ -6852,8 +7127,6 @@
                         }
                         --i;
                     }
-
-
                 } // EO for
             }
 
@@ -6874,7 +7147,7 @@
                     }
 
                     if (isGFFCtx)
-                        $fields[field].setAttribute('data-gina-form-errors', fieldErrorsAttributes[field].substr(0, fieldErrorsAttributes[field].length-1))
+                        $fields[field].setAttribute('data-gina-form-errors', fieldErrorsAttributes[field].substring(0, fieldErrorsAttributes[field].length-1))
                 }
 
                 //calling back
@@ -6945,6 +7218,8 @@
                         'data'      : formatData( _data )
                     });
                     removeListener(gina, event.target, 'validated.' + event.target.id);
+
+
                     return
                 }
             });