gina 0.1.1-alpha.161 → 0.1.1-alpha.163

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/core/asset/plugin/dist/gina.js

@@ -3665,10 +3665,19 @@ function PrototypesHelper(instance) {
     }
 
     if ( typeof(JSON.clone) == 'undefined' && !isGFFCtx ) {
-        if ( typeof(envVars) != 'undefined' ) {
+        if ( typeof(envVars) != 'undefined' && envVars != null ) {
             JSON.clone = require( envVars.GINA_DIR +'/utils/prototypes.json_clone');
         } else {
-            JSON.clone = require( GINA_DIR +'/utils/prototypes.json_clone');
+            // For unit tests
+            if (!envVars) {
+                var ginaDir = process.cwd().match(/.*\/gina/)[0];
+                require(ginaDir +'/utils/helper');
+                setEnvVar('GINA_DIR', ginaDir, true);
+                envVars = getEnvVars();
+            }
+
+            // JSON.clone = require( GINA_DIR +'/utils/prototypes.json_clone');
+            JSON.clone = require( getEnvVar('GINA_DIR') +'/utils/prototypes.json_clone');
         }
     }
 
@@ -5819,14 +5828,14 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
     // if (isGFFCtx && !$fields )
     //     throw new Error('No `Validator` instance found.\nTry:\nvar FormValidator = require("gina/validator"):\nvar formValidator = new FormValidator(...);')
-        
+
     var merge           = (isGFFCtx) ? require('utils/merge') : require('../../../../../lib/merge');
     var helpers         = (isGFFCtx) ? {} : require('../../../../../helpers');
     var dateFormat      = (isGFFCtx) ? require('helpers/dateFormat') : helpers.dateFormat;
     var routing         = (isGFFCtx) ? require('utils/routing') : require('../../../../../lib/routing');
-    
+
     var hasUserValidators = function() {
-        
+
         var _hasUserValidators = false, formsContext = null;
         // backend validation check
         if (!isGFFCtx) {
@@ -5839,7 +5848,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             _hasUserValidators = true
         }
         return _hasUserValidators;
-    } 
+    }
     /**@js_externs local*/
     var local = {
         'errors': {},
@@ -5888,12 +5897,12 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         self  = merge( JSON.clone(data), self );
         local.data = merge( JSON.clone(data), local.data);
     }
-    
+
     var getElementByName = function($form, name) { // frontend only
         var $foundElement   = null;
         for (let f in fieldsSet) {
             if (fieldsSet[f].name !== name) continue;
-            
+
             $foundElement = new DOMParser()
                 .parseFromString($form.innerHTML , 'text/html')
                 .getElementById( fieldsSet[f].id );
@@ -5901,16 +5910,16 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         }
         if ($foundElement)
             return $foundElement;
-        
+
         throw new Error('Field `'+ name +'` not found in fieldsSet');
     }
-    
+
     /**
      * bufferToString - Convert Buffer to String
      * Will apply `Utf8Array` to `String`
-     * @param {array} arrayBuffer 
+     * @param {array} arrayBuffer
      */
-    var bufferToString = function(arrayBuffer) {        
+    var bufferToString = function(arrayBuffer) {
         var out     = null
             , i     = null
             , len   = null
@@ -5923,7 +5932,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         i   = 0;
         while(i < len) {
             c = arrayBuffer[i++];
-            switch (c >> 4) { 
+            switch (c >> 4) {
                 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
                     // 0xxxxxxx
                     out += String.fromCharCode(c);
@@ -5946,22 +5955,40 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
         return out;
     };
-    
+
+    var compileError = function(error, data) {
+        var varArr = error.match(/\{\{([^{{}}]+)\}\}/g );
+        for (let v=0, vLen=varArr.length; v<vLen; v++) {
+            let localValue = varArr[v]
+                                .replace(/\[/g, '["')
+                                .replace(/\]/g, '"]')
+                                .replace(/\{|\}/g, '')
+                                .trim();
+
+            try {
+                localValue = eval('data.'+ localValue).replace(/^\"|\"$/g, '');
+                error = error.replace( new RegExp( varArr[v].replace(/\{|\[|\]|\}/g, '\\$&') , 'g'), localValue);
+            } catch(e) {}
+        }
+
+        return error
+    };
+
     // TODO - One method for the front, and one for the server
     var queryFromFrontend = function(options, errorMessage) {
-        var errors      = self[this['name']]['errors'] || {}; 
+        var errors      = self[this['name']]['errors'] || {};
         var id          = this.target.id || this.target.getAttribute('id');
-        
-        
-        // stop if 
-        //  - previous error detected      
-        if ( !self.isValid() ) {            
+
+
+        // stop if
+        //  - previous error detected
+        if ( !self.isValid() ) {
             console.debug('stopping on errors ...');
             triggerEvent(gina, this.target, 'asyncCompleted.' + id, self[this['name']]);
             //return self[this.name];
             return;
         }
-        
+
         var testedValue = this.target.dataset.ginaFormValidatorTestedValue;
         console.debug('[ '+ this['name'] +' ]', 'TESTED VALUE -> ' + this.value +' vs '+ testedValue);
         var _evt = 'asyncCompleted.' + id;
@@ -5971,53 +5998,54 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                             && typeof(gina.validator.$forms[currentFormId]) != 'undefined'
                             && typeof(gina.validator.$forms[currentFormId].cachedErrors) != 'undefined'
                         )
-                        ? gina.validator.$forms[currentFormId].cachedErrors 
+                        ? gina.validator.$forms[currentFormId].cachedErrors
                         : null;
         if ( !testedValue || typeof(testedValue) == 'undefined' || testedValue !== this.value ) {
             this.target.dataset.ginaFormValidatorTestedValue = this.value;
             // remove cachedErrors
-            if ( 
-                cachedErrors 
+            if (
+                cachedErrors
                 && typeof(cachedErrors[this.name]) != 'undefined'
                 && typeof(cachedErrors[this.name].query) != 'undefined'
             ) {
                 delete cachedErrors[this.name].query;
-                if ( 
+                if (
                     typeof(gina.validator.$forms[currentFormId]) != 'undefined'
                     &&
                     typeof(gina.validator.$forms[currentFormId].errors) != 'undefined'
                 ) {
                     delete gina.validator.$forms[currentFormId].errors.query;
                 }
-                
+
             }
         } else if (testedValue === this.value) {
             // not resending to backend, but in case of cached errors, re display same error message
-            var hasCachedErrors = false;            
-            if ( 
-                cachedErrors 
+            var hasCachedErrors = false;
+            if (
+                cachedErrors
                 && typeof(cachedErrors[this.name]) != 'undefined'
-                && typeof(cachedErrors[this.name].query) != 'undefined' 
-                && typeof(cachedErrors[this.name].query[this.value]) != 'undefined' 
+                && typeof(cachedErrors[this.name].query) != 'undefined'
+                && typeof(cachedErrors[this.name].query[this.value]) != 'undefined'
             ) {
                 this.error = errorMessage = cachedErrors[this.name].query[this.value].slice(0);
                 hasCachedErrors = true;
             }
             errors['query'] = replace( this.error || errorMessage || local.errorLabels['query'], this);
-            
+            console.debug('[2] potential cached error detected !! ', hasCachedErrors, cachedErrors, ' vs ', errors['query']);
+
             if (hasCachedErrors) {
                 this['errors'] = errors;
                 this.valid = false;
             }
-            // Do not remove this test            
+            // Do not remove this test
             if ( typeof( gina.events[_evt]) != 'undefined' ) {
                 triggerEvent(gina, this.target, _evt, self[this['name']]);
-            }           
-            
+            }
+
             return self[this.name];
         }
         //console.debug('Did not return !!!');
-                            
+
         var xhr = null, _this = this;
         // setting up AJAX
         if (window.XMLHttpRequest) { // Mozilla, Safari, ...
@@ -6032,17 +6060,17 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 catch (e) {}
             }
         }
-        
+
         // forcing to sync mode
-        var queryOptions = { isSynchrone: false, headers: {} };       
+        var queryOptions = { isSynchrone: false, headers: {} };
         var queryData = options.data || null, strData = null;
         var isInlineValidation = (/^true$/i.test(this.target.form.dataset.ginaFormLiveCheckEnabled)) ? true : false; // TRUE if liveCheckEnabled
-                
+
         // replace placeholders by field values
         strData = JSON.stringify(queryData);
         if ( /\$/.test(strData) ) {
             var variables = strData.match(/\$[-_\[\]a-z 0-9]+/g) || [];
-            var value = null, key = null;            
+            var value = null, key = null;
             for (let i = 0, len = variables.length; i < len; i++) {
                 key = variables[i].replace(/\$/g, '');
                 re = new RegExp("\\"+ variables[i].replace(/\[|\]/g, '\\$&'), "g");
@@ -6051,26 +6079,26 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                     // Retrieving live value instead of using fieldsSet.value
                     value = getElementByName(this.target.form, key).value;
                 }
-                
+
                 strData = strData.replace( re, value );
             }
         }
         // cleanup before sending
-        queryData = strData.replace(/\\"/g, '');           
+        queryData = strData.replace(/\\"/g, '');
         // TODO - support regexp for validIf
         var validIf = ( typeof(options.validIf) == 'undefined' ) ? true : options.validIf;
-               
+
         queryOptions = merge(queryOptions, options, xhrOptions);
         delete queryOptions.data;
         delete queryOptions.validIf;
-        
+
         var enctype = queryOptions.headers['Content-Type'];
         var result      = null
             , $target   = this.target
             //, id        = $target.getAttribute('id')
         ;
         id = $target.getAttribute('id')
-               
+
         // checking url
         if (!/^http/.test(queryOptions.url) && /\@/.test(queryOptions.url) ) {
             try {
@@ -6080,7 +6108,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 throw routingError;
             }
         }
-        
+
         if ( queryOptions.withCredentials ) {
             if ('withCredentials' in xhr) {
                 // XHR for Chrome/Firefox/Opera/Safari.
@@ -6096,7 +6124,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 //     xhr.open(queryOptions.method, queryOptions.url, queryOptions.isSynchrone);
                 // } else {
                     xhr.open(queryOptions.method, queryOptions.url);
-                // }                
+                // }
             } else {
                 // CORS not supported.
                 xhr = null;
@@ -6104,10 +6132,10 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 //triggerEvent(gina, $target, 'error.' + id, result);
                 throw new Error(result);
             }
-            
+
             if ( typeof(queryOptions.responseType) != 'undefined' ) {
                 /**
-                 * Note: We expect to remove support for synchronous use of XMLHTTPRequest() during page unloads in Chrome in version 88, 
+                 * Note: We expect to remove support for synchronous use of XMLHTTPRequest() during page unloads in Chrome in version 88,
                  * scheduled to ship in January 2021.
                  * The XMLHttpRequest2 spec was recently changed to prohibit sending a synchronous request when XMLHttpRequest.responseType
                  */
@@ -6124,132 +6152,212 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 xhr.open(queryOptions.method, queryOptions.url)
             }
         }
-        
+
         // setting up headers -    all but Content-Type ; it will be set right before .send() is called
         for (var hearder in queryOptions.headers) {
             if (hearder == 'Content-Type' && typeof (enctype) != 'undefined' && enctype != null && enctype != '')
                 continue;
 
             xhr.setRequestHeader(hearder, queryOptions.headers[hearder]);
-        }        
+        }
         if (typeof (enctype) != 'undefined' && enctype != null && enctype != '') {
             xhr.setRequestHeader('Content-Type', enctype);
         }
-        
-        if (xhr) {
-            
-            xhr.onload = function () {                
-                
-                var onResult = function(result) {
-            
-                    _this.value      = local['data'][_this.name] = (_this.value) ? _this.value.toLowerCase() : _this.value;
-        
-                    var isValid     = result.isValid || false;
-                    if (validIf != isValid) {
-                        isValid = false;                        
-                    } else {
-                        isValid = true;
+
+        var onResult = function(result) {
+
+            _this.value      = local['data'][_this.name] = (_this.value) ? _this.value.toLowerCase() : _this.value;
+
+            var isValid     = result.isValid || false;
+            if (validIf != isValid) {
+                isValid = false;
+            } else {
+                isValid = true;
+            }
+            self[_this['name']].valid = isValid;
+            var errors      = self[_this['name']]['errors'] || {};
+
+            var errorFields = ( typeof(result.error) != 'undefined' && typeof(result.fields) != 'undefined' ) ? result.fields : {};
+
+            if (errorFields.count() > 0 && !isValid || !isValid) {
+
+                if (!isValid) {
+                    var systemError = null;
+                    if ( typeof(errorFields[_this.name]) != 'undefined') {
+
+                        // compiling against rules[field].query.data
+                        local.errorLabels['query'] = compileError(errorFields[_this.name], options.data);
+
+
+                    } else if ( typeof(result.error) != 'undefined' && /^5/.test(result.status) ) {
+                        // system error
+                        systemError = result.error;
                     }
-                    self[_this['name']].valid = isValid;
-                    var errors      = self[_this['name']]['errors'] || {};
-                    
-                    var errorFields = ( typeof(result.error) != 'undefined' && typeof(result.fields) != 'undefined' ) ? result.fields : {};
-                    
-                    if (errorFields.count() > 0 && !isValid || !isValid) {
-                                    
-                        if (!isValid) {
-                            var systemError = null;
-                            if ( typeof(errorFields[_this.name]) != 'undefined') {
-                                local.errorLabels['query'] = errorFields[_this.name];                                
-                            } else if ( typeof(result.error) != 'undefined' && /^5/.test(result.status) ) {
-                                // system error
-                                //console.debug('found system error: ', result);
-                                systemError = result.error;
-                            }                    
-                            errors['query'] = replace(systemError || _this['error'] || options['error'] || local.errorLabels['query'],  _this);
-                            console.debug('query error detected !! ', result);
-                        }
-                        
-                        if ( !errors['query'] && _this.value == '' ) {
-                            isValid = true;
-                        }
+                    // Fixed on 2023-01-10
+                    // We want `local.errorLabels['query']` before the generic|user defined `rule` error
+                    errors['query'] = replace(systemError || _this['error'] || local.errorLabels['query'] || options['error'],  _this);
+                    console.debug('[1] query error detected !! ', result);
+                }
+
+                if ( !errors['query'] && _this.value == '' ) {
+                    isValid = true;
+                }
+            }
+
+            // if error tagged by a previous validation, remove it when isValid == true
+            if ( isValid && typeof(errors['query']) != 'undefined' ) {
+                delete errors['query'];
+            }
+
+            // To handle multiple errors from backend
+            // for (var f in errorFields.length) {
+            //     if ( !errors['query'] && _this.value == '' ) {
+            //         isValid = true;
+            //     }
+
+            //     if (!isValid) {
+            //         errors['query'] = replace(_this['error'] || local.errorLabels['query'], _this)
+            //     }
+            //     // if error tagged by a previous validation, remove it when isValid == true
+            //     else if ( isValid && typeof(errors['query']) != 'undefined' ) {
+            //         delete errors['query'];
+            //     }
+            // }
+
+            _this.valid = isValid;
+            var cachedErrors = gina.validator.$forms[_this.target.form.getAttribute('id')].cachedErrors || {};
+            if ( errors.count() > 0 ) {
+
+                _this['errors'] = errors;
+                if ( typeof(self[_this['name']].errors) == 'undefined' ) {
+                    self[_this['name']].errors = {};
+                }
+
+                self[_this['name']].errors = merge(self[_this['name']].errors, errors);
+
+                if ( typeof(errors.query) != 'undefined' && errors.query ) {
+
+                    if ( typeof(cachedErrors[_this.name]) == 'undefined' ) {
+                        cachedErrors[_this.name] = {}
                     }
-                    
-                    // if error tagged by a previous validation, remove it when isValid == true 
-                    if ( isValid && typeof(errors['query']) != 'undefined' ) {
-                        delete errors['query'];
+                    if ( typeof(cachedErrors[_this.name].query) == 'undefined' ) {
+                        cachedErrors[_this.name].query = {}
                     }
-                    
-                    // To handle multiple errors from backend
-                    // for (var f in errorFields.length) {
-                    //     if ( !errors['query'] && _this.value == '' ) {
-                    //         isValid = true;
-                    //     }
-            
-                    //     if (!isValid) {
-                    //         errors['query'] = replace(_this['error'] || local.errorLabels['query'], _this)
-                    //     }
-                    //     // if error tagged by a previous validation, remove it when isValid == true 
-                    //     else if ( isValid && typeof(errors['query']) != 'undefined' ) {
-                    //         delete errors['query'];
-                    //     }
-                    // }
-                            
-                    _this.valid = isValid;
-                    var cachedErrors = gina.validator.$forms[_this.target.form.getAttribute('id')].cachedErrors || {};
-                    if ( errors.count() > 0 ) {
-                        
-                        _this['errors'] = errors;
-                        if ( typeof(self[_this['name']].errors) == 'undefined' ) {
-                            self[_this['name']].errors = {};
-                        }
-                        
-                        self[_this['name']].errors = merge(self[_this['name']].errors, errors);
-                        
-                        if ( typeof(errors.query) != 'undefined' && errors.query ) {
-                            
-                            if ( typeof(cachedErrors[_this.name]) == 'undefined' ) {
-                                cachedErrors[_this.name] = {}
-                            }
-                            if ( typeof(cachedErrors[_this.name].query) == 'undefined' ) {
-                                cachedErrors[_this.name].query = {}
-                            }
-                            
-                            cachedErrors[_this.name].query[_this.value] = errors.query.slice(0);
-                        }
-                        
-                        var errClass = _this.target.getAttribute('data-gina-form-errors');
-                        if ( !/query/.test(errClass) ) {
-                            if ( !errClass || errClass =='' ) {
-                                errClass = 'query' 
-                            } else {
-                                errClass +=' query'
+
+                    cachedErrors[_this.name].query[_this.value] = errors.query.slice(0);
+                }
+
+                var errClass = _this.target.getAttribute('data-gina-form-errors');
+                if ( !/query/.test(errClass) ) {
+                    if ( !errClass || errClass =='' ) {
+                        errClass = 'query'
+                    } else {
+                        errClass +=' query'
+                    }
+                    _this.target.setAttribute('data-gina-form-errors', errClass);
+                }
+            } else if (
+                typeof(cachedErrors[_this.name]) != 'undefined'
+                && typeof(cachedErrors[_this.name].query) != 'undefined'
+                && typeof(cachedErrors[_this.name].query[_this.value]) != 'undefined'
+            ) {
+                delete cachedErrors[_this.name].query[_this.value];
+            }
+
+            var id = _this.target.id || _this.target.getAttribute('id');
+            console.debug('prematurely completed event `'+ 'asyncCompleted.' + id +'`');
+            return triggerEvent(gina, _this.target, 'asyncCompleted.' + id, self[_this['name']]);
+        } // EO onResult
+
+
+        if (xhr) {
+
+            xhr.onerror = function(event, err) {
+
+                var error = 'Transaction error: might be due to the server CORS settings.\nPlease, check the console for more details.';
+                var result = {
+                    'status':  xhr.status, //500,
+                    'error' : error
+                };
+
+                console.debug('query error [2] detected !! ', err, error);
+                isOnException = true;
+                result = this.responseText;
+                    var contentType     = this.getResponseHeader("Content-Type");
+                    if ( /\/json/.test( contentType ) ) {
+                        result = JSON.parse(this.responseText);
+
+                        if ( typeof(result.status) == 'undefined' )
+                            result.status = this.status;
+
+                        //triggerEvent(gina, $target, 'success.' + id, result);
+                        return onResult(result)
+                    } else {
+                        result = { 'status': xhr.status, 'message': '' };
+                        if ( /^(\{|\[)/.test( xhr.responseText ) ) {
+                            try {
+                                result = merge( result, JSON.parse(xhr.responseText) );
+                            } catch (err) {
+                                result = merge(result, err);
                             }
-                            _this.target.setAttribute('data-gina-form-errors', errClass);
                         }
-                    } else if ( 
-                        typeof(cachedErrors[_this.name]) != 'undefined'
-                        && typeof(cachedErrors[_this.name].query) != 'undefined'
-                        && typeof(cachedErrors[_this.name].query[_this.value]) != 'undefined'
-                    ) {
-                        delete cachedErrors[_this.name].query[_this.value];
+                        return onResult(result);
                     }
-                                            
-                    var id = _this.target.id || _this.target.getAttribute('id');
-                    console.debug('prematurely completed event `'+ 'asyncCompleted.' + id +'`');
-                    return triggerEvent(gina, _this.target, 'asyncCompleted.' + id, self[_this['name']]);
-                }
-                
+
+            }// Eo xhr.onerror
+
+            // catching ready state cb
+            // var isOnException = false;
+            // xhr.onreadystatechange = function (event) {
+            //     if (xhr.readyState == 4) {
+
+            //         console.warn(xhr.status, xhr.responseText);
+
+            //         if (xhr.status === 200) {
+            //             console.log("-> Success [3]" + xhr.responseText);
+            //             try {
+            //                 result = this.responseText;
+            //                 var contentType     = this.getResponseHeader("Content-Type");
+            //                 if ( /\/json/.test( contentType ) ) {
+            //                     result = JSON.parse(this.responseText);
+
+            //                     if ( typeof(result.status) == 'undefined' )
+            //                         result.status = this.status;
+
+            //                     //triggerEvent(gina, $target, 'success.' + id, result);
+            //                     return onResult(result)
+            //                 } else {
+            //                     result = { 'status': xhr.status, 'message': '' };
+            //                     if ( /^(\{|\[)/.test( xhr.responseText ) ) {
+            //                         try {
+            //                             result = merge( result, JSON.parse(xhr.responseText) );
+            //                         } catch (err) {
+            //                             result = merge(result, err);
+            //                         }
+            //                     }
+            //                     return onResult(result);
+            //                 }
+            //             } catch (err) {
+            //                 throw err;
+            //             }
+            //         } else {
+            //             isOnException = true;
+            //             console.log("-> Error [3]", xhr.statusText, 'isOnException: '+ isOnException);
+            //         }
+            //     }
+            // } // EO xhr.onreadystatechange = function (event) {
+
+            xhr.onload = function () {
                 try {
                     result = this.responseText;
                     var contentType     = this.getResponseHeader("Content-Type");
                     if ( /\/json/.test( contentType ) ) {
                         result = JSON.parse(this.responseText);
-                        
+
                         if ( typeof(result.status) == 'undefined' )
                             result.status = this.status;
-                            
-                        //triggerEvent(gina, $target, 'success.' + id, result); 
+
+                        //triggerEvent(gina, $target, 'success.' + id, result);
                         return onResult(result)
                     } else {
                         result = { 'status': xhr.status, 'message': '' };
@@ -6264,32 +6372,32 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                     }
                 } catch (err) {
                     throw err;
-                }                    
-            }
-            
+                }
+            }// xhr.onload = function () {
+
             if (data) {
                 xhr.send( queryData ); // stringyfied
             }  else {
                 xhr.send();
-            }                                    
+            }
         }
     }
-    
+
     /**
      * queryFromBackend
-     * 
-     * 
-     * @param {object} options 
-     * @param {object} request 
-     * @param {object} response 
+     *
+     *
+     * @param {object} options
+     * @param {object} request
+     * @param {object} response
      * @param {callback} next
-     *  
-     * 
+     *
+     *
      */
     var queryFromBackend = async function(options, request, response, next) {
         var Config = require(_(GINA_FRAMEWORK_DIR +'/core/config.js', true));
         var config      = new Config().getInstance();
-        
+
         var opt     = null
             //appConf.proxy.<bundle>;
             , rule  = null
@@ -6298,7 +6406,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         ;
         // trying to retrieve proxy conf
         if ( /\@/.test(options.url) ) {
-            var attr = options.url.split(/@/); 
+            var attr = options.url.split(/@/);
             rule = attr[0];
             bundle = attr[1];
             var proxyConf = getConfig( currentBundle, 'app' ).proxy;
@@ -6306,11 +6414,11 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 if (config.bundle !== bundle) { // ignore if same bundle
                     // getting proxy conf when available
                     opt = getConfig( currentBundle, 'app' ).proxy[bundle];
-                }               
+                }
             } catch (proxyError) {
                 throw new Error('Could not retrieve `proxy` configuration for bundle `'+ bundle +'`. Please check your `/config/app.json`.\n'+proxyError.stack);
             }
-            
+
             attr = null;
         } else {
             // TODO - handle else; when it is an external domain/url
@@ -6318,7 +6426,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         }
         var route       = JSON.clone(routing.getRoute(options.url, options.data));
         var env         = config.env;
-        var conf        = config[bundle][env]; 
+        var conf        = config[bundle][env];
         if (!opt) { // setup opt by default if no proxy conf found
             if (config.bundle == bundle) {
                 var credentials = getConfig( currentBundle, 'settings' ).server.credentials;
@@ -6328,13 +6436,13 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 options.protocol    = conf.server.protocol;
                 options.rejectUnauthorized  = false;
             }
-            opt = {       
+            opt = {
                 "ca"        : options.ca,
-                "hostname"  : options.hostname,        
-                "port"      : options.port,   
+                "hostname"  : options.hostname,
+                "port"      : options.port,
                 "path"      : options.path
             };
-            
+
             if ( typeof(options.protocol) != 'undefined' ) {
                 opt.protocol = options.protocol
             }
@@ -6342,7 +6450,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 opt.rejectUnauthorized = options.rejectUnauthorized
             }
         }
-        
+
         /**
          * BO routing configuration
          * Attention: this portion of code is from `router.js`
@@ -6361,7 +6469,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             isXMLRequest        : request.isXMLRequest,
             isWithCredentials   : request.isWithCredentials
         };
-        
+
         var templateName = params.rule.replace('\@'+ bundle, '') || '_common';
         var routeHasViews = ( typeof(conf.content.templates) != 'undefined' ) ? true : false;
         var controllerOptions = {
@@ -6384,9 +6492,9 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             //path: params.param.path || null, // user custom path : namespace should be ignored | left blank
             //assets: {}
         };
-        
-        controllerOptions = merge(controllerOptions, params);        
-        
+
+        controllerOptions = merge(controllerOptions, params);
+
         // BO - Template outside of namespace fix added on 2021-08-19
         // We want to keep original conf untouched
         controllerOptions.conf = JSON.clone(conf);
@@ -6397,7 +6505,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             && typeof(controllerOptions.template.ginaLoader) == 'undefined'
         ) {
             controllerOptions.template.ginaLoader = controllerOptions.conf.content.templates._common.ginaLoader;
-        }            
+        }
         controllerOptions.conf.content.routing[controllerOptions.rule].param = params.param;
         delete controllerOptions.middleware;
         delete controllerOptions.param;
@@ -6406,17 +6514,17 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         /**
          * EO routing configuration
          */
-        
+
         var Controller = require(_(GINA_FRAMEWORK_DIR +'/core/controller/controller.js'), true);
         var controller = new Controller(controllerOptions);
-        controller.name = route.param.control;            
+        controller.name = route.param.control;
         //controller.serverInstance = serverInstance;
         controller.setOptions(request, response, next, controllerOptions);
-        
-                                        
+
+
         var data = ( typeof(options.data) == 'object' && options.data.count() > 0 )
                 ? options.data
-                : {};        
+                : {};
         // inherited data from current query asking for validation
         var urlParams = '';
         if ( /^get|delete|put$/i.test(options.method) ) {
@@ -6434,11 +6542,11 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         opt.method  = options.method;
         //opt.path    = route.url + urlParams;
         opt.path    = route.url;
-             
+
         var util            = require('util');
         var promisify       = util.promisify;
         var result = { isValid: false }, err = false;
-          
+
         await promisify(controller.query)(opt, data)
             .then(function onResult(_result) {
                 result = _result;
@@ -6450,10 +6558,10 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             //throw err;
             console.error(err);
             result.error = err;
-        }    
+        }
         return result;
     };
-        
+
     /**
      * query
      */
@@ -6468,16 +6576,16 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
     /**
      * addField
      * Add field to the validation context
-     * @param {string} el 
-     * @param {string|boolean|number|object} [value] 
+     * @param {string} el
+     * @param {string|boolean|number|object} [value]
      */
-    var addField = function(el, value) {        
+    var addField = function(el, value) {
         var val = null, label = null;
-        
+
         if ( typeof(self[el]) == 'undefined' && typeof(value) != 'undefined' ) {
             self[el] = val = value;
         }
-        
+
         if ( typeof(self[el]) == 'object' ) {
             try {
                 val = JSON.parse( JSON.stringify( self[el] ))
@@ -6527,17 +6635,17 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             var alias       = ( typeof(window) != 'undefined' && typeof(window._currentValidatorAlias) != 'undefined' ) ? window._currentValidatorAlias : 'is';
             if ( typeof(window) != 'undefined'  && window._currentValidatorAlias)
                 delete window._currentValidatorAlias;
-                
-            var errors      = self[this['name']]['errors'] || {};  
+
+            var errors      = self[this['name']]['errors'] || {};
             local.data[this.name] = self[this.name].value;
-            
-            if ( 
+
+            if (
                 typeof(errors['isRequired']) == 'undefined'
                 && this.value == ''
-                && !/^false$/i.test(this.value) 
-                && this.value != 0 
+                && !/^false$/i.test(this.value)
+                && this.value != 0
                 ||
-                !errors['isRequired'] 
+                !errors['isRequired']
                 && this.value == ''
                 && !/^false$/i.test(this.value)
                 && this.value != 0
@@ -6546,14 +6654,14 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             } else if (!errors['isRequired'] && typeof(this.value) == 'string' && this.value == '') {
                 isValid = true;
             }
-            
+
             if ( !isValid && /^(true|false)$/i.test(condition) ) { // because it can be evaluated on backend validation
                 isValid = condition;
             } else if (!isValid) {
                 var re = null, flags = null;
                 // Fixed on 2021-03-13: $variable now replaced with real value beafore validation
                 if ( /[\!\=>\>\<a-z 0-9]+/i.test(condition) ) {
-                    var variables = condition.match(/\${0}[-_,.\[\]a-z0-9]+/ig); // without space(s)                    
+                    var variables = condition.match(/\${0}[-_,.\[\]a-z0-9]+/ig); // without space(s)
                     if (variables && variables.length > 0) {
                         var compiledCondition = condition;
                         for (var i = 0, len = variables.length; i < len; ++i) {
@@ -6569,7 +6677,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                                 }
                             }
                         }
-                        
+
                         try {
                             // security checks
                             compiledCondition = compiledCondition.replace(/(\(|\)|return)/g, '');
@@ -6578,7 +6686,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                             } else {
                                 isValid = eval(compiledCondition)
                             }
-                            
+
                         } catch (err) {
                             throw new Error(err.stack||err.message)
                         }
@@ -6602,7 +6710,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                         } else {
                             isValid = eval(condition);
                         }
-                            
+
                         //valid = new RegExp(condition.replace(/\//g, '')).test(this.value)
                     } catch (err) {
                         throw new Error(err.stack||err.message)
@@ -6615,7 +6723,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 if ( typeof(errorStack) != 'undefined' )
                     errors['stack'] = errorStack;
             }
-            // if error tagged by a previous vlaidation, remove it when isValid == true 
+            // if error tagged by a previous vlaidation, remove it when isValid == true
             else if ( isValid && typeof(errors[alias]) != 'undefined' ) {
                 delete errors[alias];
                 //delete errors['stack'];
@@ -6625,16 +6733,16 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             if ( errors.count() > 0 )
                 this['errors'] = errors;
 
-            
+
             return self[this.name]
         }
-        
+
         self[el]['set'] = function(value) {
             this.value  = local['data'][this.name] = value;
-            //  html 
+            //  html
             this.target.setAttribute('value', value);
             // Todo : select and radio case to apply change
-            
+
             return self[this.name]
         }
 
@@ -6643,15 +6751,15 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
             this.value      = local['data'][this.name] = (this.value) ? this.value.toLowerCase() : this.value;
             // Apply on current field upper -> lower
-            if ( 
+            if (
                 isGFFCtx
                 && this.target
-                && this.target.value != '' 
-                && /[A-Z]+/.test(this.target.value) 
+                && this.target.value != ''
+                && /[A-Z]+/.test(this.target.value)
             ) {
                 this.target.value = this.value;
             }
-                
+
 
             var rgx         = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
             var isValid     = rgx.test(this['value']) ? true : false;
@@ -6664,7 +6772,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             if (!isValid) {
                 errors['isEmail'] = replace(this['error'] || local.errorLabels['isEmail'], this)
             }
-            // if error tagged by a previous vlaidation, remove it when isValid == true 
+            // if error tagged by a previous vlaidation, remove it when isValid == true
             else if ( isValid && typeof(errors['isEmail']) != 'undefined' ) {
                 delete errors['isEmail'];
                 //delete errors['stack'];
@@ -6683,11 +6791,11 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
             this.value      = local['data'][this.name] = (this.value) ? this.value.toLowerCase() : this.value;
             // Apply on current field upper -> lower
-            if ( 
+            if (
                 isGFFCtx
                 && this.target
-                && this.target.value != '' 
-                && /[A-Z]+/.test(this.target.value) 
+                && this.target.value != ''
+                && /[A-Z]+/.test(this.target.value)
             ) {
                 this.target.value = this.value;
             }
@@ -6703,7 +6811,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             if (!isValid) {
                 errors['isJsonWebToken'] = replace(this['error'] || local.errorLabels['isJsonWebToken'], this)
             }
-            // if error tagged by a previous vlaidation, remove it when isValid == true 
+            // if error tagged by a previous vlaidation, remove it when isValid == true
             else if ( isValid && typeof(errors['isJsonWebToken']) != 'undefined' ) {
                 delete errors['isJsonWebToken'];
                 //delete errors['stack'];
@@ -6716,7 +6824,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
             return self[this['name']]
         }
-        
+
         /**
          * Check if boolean and convert to `true/false` booloean if value is a string or a number
          * Will include `false` value if isRequired
@@ -6744,13 +6852,13 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                     val = this.value = local.data[this.name] = false;
                     break;
             }
-            
+
             var isValid = (val !== null) ? true : false;
 
             if (!isValid) {
                 errors['isBoolean'] = replace(this.error || local.errorLabels['isBoolean'], this)
             }
-            // if error tagged by a previous vlaidation, remove it when isValid == true 
+            // if error tagged by a previous vlaidation, remove it when isValid == true
             else if ( isValid && typeof(errors['isBoolean']) != 'undefined' ) {
                 delete errors['isBoolean'];
                 //delete errors['stack'];
@@ -6782,7 +6890,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 , isMaxLength   = true
                 , errors        = self[this['name']]['errors'] || {}
             ;
-            
+
             // test if val is a number
             try {
                 // if val is a string replaces comas by points
@@ -6831,7 +6939,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
                 isValid = false;
             }
-            // if error tagged by a previous vlaidation, remove it when isValid == true 
+            // if error tagged by a previous vlaidation, remove it when isValid == true
             if ( isValid && typeof(errors['isNumberLength']) != 'undefined') {
                 delete errors['isNumberLength'];
             }
@@ -6937,7 +7045,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                     //     document.getElementById(this.target.id).value = this.value;
                     //     //triggerEvent(gina, this.target, 'change', self[this['name']]);
                     // }
-                        
+
                 } else {
                     this.value = this.value.replace(/\,/g,'');
                 }
@@ -7050,7 +7158,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             if ( typeof(isApplicable) == 'boolean' && !isApplicable ) {
 
                 this.valid = true;
-                
+
                 // is in excluded ?
                 var excludedIndex = local.excluded.indexOf(this.name);
                 if ( excludedIndex > -1 ) {
@@ -7061,12 +7169,12 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             }
 
             // radio group case
-            if ( 
-                isGFFCtx 
-                && this.target 
-                && this.target.tagName == 'INPUT' 
-                && typeof(this.target.type) != 'undefined' 
-                && this.target.type == 'radio' 
+            if (
+                isGFFCtx
+                && this.target
+                && this.target.tagName == 'INPUT'
+                && typeof(this.target.type) != 'undefined'
+                && this.target.type == 'radio'
             ) {
                 var radios = document.getElementsByName(this.name);
                 for (var i = 0, len = radios.length; i < len; ++i) {
@@ -7091,7 +7199,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             if (!isValid) {
                 errors['isRequired'] = replace(this.error || local.errorLabels['isRequired'], this)
             }
-            // if error tagged by a previous vlaidation, remove it when isValid == true 
+            // if error tagged by a previous vlaidation, remove it when isValid == true
             else if ( isValid ) {
                 if (typeof(errors['isRequired']) != 'undefined' )
                     delete errors['isRequired'];
@@ -7116,7 +7224,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
          * {
          *  "password": {
          *      "isRequired": true,
-         * 
+         *
          *      "isString": true // Means that we just want a string and we don't care of its length
          *      // OR
          *      "isString": 7 // Means at least 7 chars length
@@ -7196,7 +7304,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
          *
          * @returns {date} date - extended by gina::utils::dateFormat; an adaptation of Steven Levithan's code
          * */
-        self[el]['isDate'] = function(mask) {                        
+        self[el]['isDate'] = function(mask) {
             var val         = this.value
                 , isValid   = false
                 , errors    = self[this['name']]['errors'] || {}
@@ -7204,37 +7312,37 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 , date      = null
             ;
             // Default validation on livecheck & invalid init value
-            if (!val || val == '' || /NaN|Invalid Date/i.test(val) ) {                
+            if (!val || val == '' || /NaN|Invalid Date/i.test(val) ) {
                 if ( /NaN|Invalid Date/i.test(val) ) {
                     console.warn('[FormValidator::isDate] Provided value for field `'+ this.name +'` is not allowed: `'+ val +'`');
                     errors['isDate'] = replace(this.error || local.errorLabels['isDate'], this);
-                    
+
                 }
                 this.valid = isValid;
                 if ( errors.count() > 0 )
-                    this['errors'] = errors;     
-                        
+                    this['errors'] = errors;
+
                 return self[this.name];
             }
-            
-            if ( 
+
+            if (
                 typeof(mask) == 'undefined'
                 ||
                 typeof(mask) != 'undefined' && /true/i.test(mask)
             ) {
                 mask = "yyyy-mm-dd"; // by default
             }
-            
+
             if (val instanceof Date) {
                 date = val.format(mask);
             } else {
-                
+
                 try {
                     m = mask.match(/[^\/\- ]+/g);
                 } catch (err) {
                     throw new Error('[FormValidator::isDate] Provided mask not allowed: `'+ mask +'`');
                 }
-                
+
                 try {
                     val = val.match(/[^\/\- ]+/g);
                     var dic = {}, d, len;
@@ -7248,10 +7356,10 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 } catch (err) {
                     throw new Error('[FormValidator::isDate] Provided value not allowed: `'+ val +'`' + err);
                 }
-                    
+
 
                 date = this.value = local.data[this.name] = new Date(formatedDate);
-                
+
                 if ( /Invalid Date/i.test(date) || date instanceof Date === false ) {
                     if ( !errors['isRequired'] && this.value == '' ) {
                         isValid = true
@@ -7313,7 +7421,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             }
             return self[this.name]
         }
-        
+
         /**
          * Trim when string starts or ends with white space(s)
          *
@@ -7337,11 +7445,11 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         self[el]['exclude'] = function(isApplicable) {
 
             if ( typeof(isApplicable) == 'boolean' && !isApplicable ) {
-                
+
                 if ( /^true|false$/i.test(this.value)) {
                     this.value = (/^true$/i.test(this.value)) ? true : false;
                     local.data[this.name] = this.value;
-                }                
+                }
 
                 return self[this.name]
             }
@@ -7351,8 +7459,8 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 local.excluded.push(this.name);
                 this.isExcluded = true;
             }
-                
-                
+
+
             // remove existing errors
             return self[this.name];
         }
@@ -7362,8 +7470,8 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
          * a request to the remote host if previous rules failed
          */
         self[el]['query'] = query;
-        
-        
+
+
         self[el]['getValidationContext'] = function() {
             return {
                 'isGFFCtx'  : isGFFCtx,
@@ -7373,10 +7481,10 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             }
         }
         // Merging user validators
-        // To debug, open inspector and look into `Extra Scripts`     
+        // To debug, open inspector and look into `Extra Scripts`
         if ( hasUserValidators() ) {
             var userValidator = null, filename = null;
-            try {                
+            try {
                 for (let v in gina.forms.validators) {
                     filename = '/validators/'+ v + '/main.js';
                     // setting default local error
@@ -7387,12 +7495,12 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                         userValidator = bufferToString(gina.forms.validators[v].data); // ok
                         var passedContext = 'var validationContext = this.getValidationContext(),isGFFCtx = validationContext.isGFFCtx,self = validationContext.self,local = validationContext.local,replace = validationContext.replace;';
                         userValidator = userValidator.replace(/(\)\s+\{|\)\{){1}/, '$&\n\t'+ passedContext);
-                        
+
                         //userValidator += '\n//#sourceURL='+ v +'.js';
                     } else {
                         userValidator = gina.forms.validators[v].toString();
                     }
-                    
+
                     self[el][v] = eval('(' + userValidator + ')\n//# sourceURL='+ v +'.js');
                     //self[el][v] = Function('errorMessage', 'errorStack', userValidator);
                 }
@@ -7400,22 +7508,22 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 throw new Error('[UserFormValidator] Could not evaluate: `'+ filename +'`\n'+userValidatorError.stack);
             }
         }
-    } // EO addField(el, value) 
-    
-    
-    for (let el in self) {        
+    } // EO addField(el, value)
+
+
+    for (let el in self) {
         // Adding fields & validators to context
         addField(el, self[el]);
     }
-    
+
     self['addField'] = function(el, value) {
         if ( typeof(self[el]) != 'undefined' ) {
             return
         }
         addField(el, value);
     };
-        
-    
+
+
     // self['getExcludedFields'] = function() {
     //     return local.excluded;
     // };
@@ -7445,33 +7553,33 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             // }
             for (var r in self[field]) {
                 // no error for the current field rule
-                if ( 
+                if (
                     typeof(errors[field]) != 'object'
                     ||
                     typeof(errors[field][r]) == 'undefined'
                 ) {
                     continue;
                 }
-                
-                
-                if ( 
-                    typeof(self[field].valid) != 'undefined' 
-                    && /^true$/i.test(self[field].valid) 
+
+
+                if (
+                    typeof(self[field].valid) != 'undefined'
+                    && /^true$/i.test(self[field].valid)
                 ) {
                     delete errors[field][r];
                     continue;
                 }
-                
-                
+
+
                 if ( typeof( self[field]['errors']) == 'undefined' ) {
                     self[field]['errors'] = {}
                 }
-                
-                self[field]['errors'][r] = errors[field][r];                
+
+                self[field]['errors'][r] = errors[field][r];
             }
-            
+
             // if field does not have errors, remove errors[field]
-            if ( 
+            if (
                 typeof(self[field]['errors']) == 'undefined'
                     && typeof(errors[field]) != 'undefined'
                 ||
@@ -7488,34 +7596,34 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
     /**
      * getErrors
      * NB.: This portion is shared between the front & the back
-     * 
+     *
      * @param {string} [fieldName]
-     * 
+     *
      * @returns errors
      */
     self['getErrors'] = function(fieldName) {
         var errors = {};
-        
+
         if ( typeof(fieldName) != 'undefined' ) {
             if ( typeof(self[fieldName]) != 'undefined' && self[fieldName] && typeof(self[fieldName]['errors']) != 'undefined' && self[fieldName]['errors'].count() > 0 ) {
                 errors[fieldName] = self[fieldName]['errors'];
-            }                        
+            }
             return errors
         }
-        
+
         for (var field in self) {
-            if ( 
+            if (
                 typeof(self[field]) != 'object'
             ) {
                 continue;
             }
-                        
+
             if ( typeof(self[field]['errors']) != 'undefined' ) {
                 if ( self[field]['errors'].count() > 0)
                     errors[field] = self[field]['errors'];
             }
         }
-        
+
         return errors
     }
 
@@ -7532,7 +7640,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         // local.data = JSON.parse(JSON.stringify(local.data).replace(/\"(true|false)\"/gi, '$1'))
         return local.data
     }
-    
+
     /**@js_externs replace*/
     var replace = function(target, fieldObj) {
         var keys = target.match(/%[a-z]+/gi);
@@ -16478,7 +16586,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
 
     /**
      * Toolbar plugin
-     * 
+     *
      * TODO - search using `datatables` plugin (https://stackoverflow.com/questions/10400033/is-there-a-jquery-plugin-like-datatables-for-a-ul)
      */
     function Toolbar() {
@@ -16649,39 +16757,41 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
          * */
         var loadData = function (section, data, ginaData) {
 
-            var $currentForms = null;
+            var $currentForms = null, txt = null;
             try {
-                var txt = ($json) ? $json.text() : '';
+
+                txt = ($json) ? $json.text() : '';
                 if (txt == '' || txt == 'null' ) {
                     $json.text('Empty')
                 } else {
                     jsonObject = JSON.parse( txt );
                     ginaJsonObject = JSON.parse($ginaJson.text());
-                    
+
                     $json.text('');
 
                     // backing up document data for restore action
                     if (!originalData) {
-                        
+
                         originalData = {
                             jsonObject      : JSON.clone(jsonObject),
                             ginaJsonObject  : JSON.clone( ginaJsonObject)
                         };
                         lastJsonObjectState = {}; // jsonObject.data
-                        
+
                     }
                 }
 
             } catch (err) {
-                
+
                 var sectionStr = ( section ) ? ' [ '+ section + ' ] ' : ' ';
-                var _err = 'Could not load'+ sectionStr +'json\n' + (err.stack||err.message||err);
+                // var _err = 'Could not load'+ sectionStr +'json\n' + (err.stack||err.message||err);
+                var _err = 'Could not load'+ sectionStr +'json\n' + err.message +'\n'+ err.stack;
                 if ($json) {
                     $json.text(_err);
                 } else {
                     throw _err;
                 }
-                
+
             }
 
             if (jsonObject) {
@@ -16739,7 +16849,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                 }
 
                 if ( !section || /^(data)$/.test(section) ) {
-                    
+
 
                     // -> Data
                     $htmlData.html('<ul class="gina-toolbar-code">' + parseObject(userObject.data, ginaObject.data, null, isXHR) +'</ul>');
@@ -16752,11 +16862,11 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                                     '</div>';
 
                     $htmlView.html(htmlProp);
-                    
+
                     $htmlView.html( parseView(userObject.view, ginaObject.view, null, isXHR, $htmlView) );
 
                     // -> Forms
-                    $currentForms = $forms;                    
+                    $currentForms = $forms;
                     $htmlForms.html('');
                     $htmlForms.html( parseForms(userObject.forms, ginaObject.forms, $htmlForms, 0, $currentForms, $currentForms.length, isXHR) );
                     // Form binding
@@ -16770,9 +16880,9 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     });
 
                     //$htmlForms.html( parseView(jsonObject.forms, ginaJsonObject.forms, null, $htmlForms) );
-                } //else 
+                } //else
                 if ( /^(data-xhr|view-xhr)$/.test(section) ) {
-                    
+
                     // reset case
                     if ( typeof(jsonObject[section]) == 'undefined' || !jsonObject[section] || jsonObject[section] == 'null' ) {
                         return false;
@@ -16781,11 +16891,11 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     // -> XHR Data
                     isXHR = true;
                     isXHRViewData = (typeof (jsonObject[section].isXHRViewData) != 'undefined') ? true : isXHRViewData;
-                        
-                    
+
+
                     // update data section without erasing old data
                     if (!isXHRViewData && !/^(view-xhr)$/.test(section)) {
-                        
+
                         // also update original data to handle restore action
                         if ( typeof (jsonObject['el-xhr']) != 'undefined' ) {
                             lastJsonObjectState.data = JSON.clone(jsonObject[section]);
@@ -16811,11 +16921,11 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                         $htmlView.html(htmlProp);
                         $htmlView.html( parseView(jsonObject[section], ginaJsonObject[section], null, isXHR, $htmlView) );
                     }
-                    
-                } //else 
+
+                } //else
                 if ( /^(el-xhr)$/.test(section) ) {
                     // -> XHR Forms
-                    isXHR = true;                    
+                    isXHR = true;
                     $currentForms = $('#' + data).find('form:not(' + formsIgnored + ')');
                     $htmlForms.html('');
                     $htmlForms.html( parseForms(userObject.forms, ginaObject.forms, $htmlForms, 0, $currentForms, $currentForms.length, isXHR ) );
@@ -16828,16 +16938,16 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                             .find('ul').first()
                             .slideToggle();
                     });
-                } //else 
+                } //else
                 if ( /^(forms)$/.test(section) ) {
                     isXHR = true;
                     self.isValidator = true;
-                    
+
                     var $form = $('#gina-toolbar-form-' + data.id);
                     // for live changes (eg.: on `Validator::getFormById()` call)
                     if ( !$form.length ) {
                         // crearte toolbar entry for the new form
-                        $currentForms = $forms;                    
+                        $currentForms = $forms;
                         $htmlForms.html('');
                         $htmlForms.html( parseForms(userObject.forms, ginaObject.forms, $htmlForms, 0, $currentForms, $currentForms.length, isXHR) );
                         // Form binding
@@ -16850,12 +16960,12 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                                 .slideToggle();
                         });
                     }
-                    
+
                     // form data sent
                     if ( typeof(data.rules) != 'undefined' ) {
                         updateForm(data.id, 'rules', data.rules, isXHR)
                     }
-                    
+
                     // form errors
                     if ( typeof(data.errors) != 'undefined' && data.errors.count() > 0 ) {
                         updateForm(data.id, 'errors', data.errors, isXHR)
@@ -16878,7 +16988,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                 if (jsonObject.file == settings.currentFile) {
                     // If current page is the same as the previous page, unfold code as neede
                     $(document).ready(function () {
-                        
+
                         if (self.isValidator ) {
                             self.isXHR = true;
                             if (settings.isUnfolded.length > 0 && !self.initiatedXhrFoldingState) {
@@ -16905,12 +17015,12 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                         }
                     })
                 }
-            }   
-            
+            }
+
             if ( !section || section == 'el-xhr' && !self.hasParsedUrls) {
                 self.hasParsedUrls = (section && section == 'el-xhr' ) ? true : false;
                 parseUrls(section);
-            }                
+            }
         }
 
 
@@ -17048,8 +17158,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             });
 
             // Show/hide toolbar using gg shorcut
-            $('body').off('keypress').on('keypress', function onKeypressed(event){                 
-            
+            $('body').off('keypress').on('keypress', function onKeypressed(event){
+
                 if (!/INPUT|TEXTAREA/.test(event.target.tagName )) {
                     if (event.keyCode) {
                         // IE
@@ -17078,10 +17188,10 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     lastPressedKey.pressTime = now.getTime();
                     lastPressedKey.keynum = keynum;
                 }
-                
+
             });
 
-                       
+
             // Updates Toolbar with current values
 
             // Select the current tab
@@ -17157,7 +17267,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
         }
 
         var toggleCodeFolding = function ($el, cb, toggledByClick) {
-            
+
             if ( typeof(toggledByClick) == 'undefined' ) {
                 var toggledByClick = false
             }
@@ -17169,7 +17279,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                 var hasXhrFlag = false;
 
                 if ( /(gina-toolbar-folding-state-[a-z 0-9_-]+|gina-toolbar-xhr-folding-state-[a-z 0-9_-]+)/i.test(self.foldingClass) ) {
-                    
+
                     if ( /gina-toolbar-folding-state-[a-z0-9_-]+/i.test(self.foldingClass) ) {
                         self.foldingClass = self.foldingClass.match(/gina-toolbar-folding-state-[a-z0-9_-]+/i)[0].replace(/gina-toolbar-folding-state-/, '');
                     } else {
@@ -17179,15 +17289,15 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     }
 
                     if ( settings.isUnfolded.indexOf(self.foldingClass) < 0 ) {
-                        
+
                         settings.isUnfolded.push(self.foldingClass);
                         settings.save();
-                        
+
                         if (!$el.hasClass('gina-toolbar-unfolded')) {
                             $el.addClass('gina-toolbar-unfolded');
                             $el.next('ul').slideToggle('fast');
                         }
-                        
+
                     } else {
 
                         if ( settings.isUnfolded.indexOf(self.foldingClass) > -1 && $el.hasClass('gina-toolbar-unfolded') ) {
@@ -17202,22 +17312,22 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                                     }
                                 }
                             }
-                            
+
                             settings.save(true);
-                            
+
                             if ( settings.isUnfolded.indexOf(self.foldingClass) < 0 ) {
                                 $el.removeClass('gina-toolbar-unfolded');
                                 $el.next('ul').slideToggle('fast');
                             }
-                                
+
 
                         } else {
                             $el.addClass('gina-toolbar-unfolded');
                             $el.next('ul').slideToggle('fast');
-                        }   
+                        }
                     }
                 }
-                
+
             }
 
             if (typeof (cb) != 'undefined' && cb != null )
@@ -17252,11 +17362,11 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
         }
 
         var normalizeFoldingStateName = function(stateSection, stateName) {
-            
+
             var foldingStateName = '', section = null, name = null;
 
             if ( typeof(stateSection) != 'undefined' && stateSection != '' ) {
-                
+
                 section = stateSection;
                 if ( typeof(stateSection) == 'string' ) {
                     section = stateSection
@@ -17264,7 +17374,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                         .replace(/\]/, '')
                         .replace(/[^A-Za-z0-9_-]/g, '_')
                 }
-                
+
                 foldingStateName += section + '-'
             }
 
@@ -17276,12 +17386,12 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                         .replace(/(\]\[|\[)/g, '-')
                         .replace(/\]/, '')
                 }
-                
+
                 foldingStateName += name
             } else {
                 foldingStateName = foldingStateName.substr(0, foldingStateName.length-1)
             }
-            
+
             return foldingStateName.trim()
         }
 
@@ -17361,14 +17471,14 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             var section         = ( typeof(elSection) != 'undefined' && elSection != null ) ? elSection : '';
             var isXHR           = ( typeof(elIsXHR) != 'undefined' && elIsXHR != null ) ? '-xhr' : '';
 
-            // patch 
+            // patch
             if (!ginaArr) {
                 ginaArr = [];
             }
             for (var i = 0, len = arr.length; i<len; ++i) {
                 if ( typeof(arr[i]) == 'object' && !Array.isArray(arr[i]) ) {
                     //id   += i + '-';
-                    // patch 
+                    // patch
                     if (!ginaArr[i]) {
                         ginaArr[i] = arr[i]
                     }
@@ -17405,7 +17515,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
         }
 
         var parseView = function (obj, ginaObj, elId, elIsXHR, $html, $root) {
-                        
+
             var id          = (elId != null) ? elId.replace(/[^A-Za-z0-9_-]/g, '_') : '';
             var section     = null;
             var isXHR       = ( typeof(elIsXHR) != 'undefined' && elIsXHR != null ) ? '-xhr' : '';
@@ -17421,7 +17531,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             if (!$root)
                 $root = $html;
 
-            for (var i in obj) {                
+            for (var i in obj) {
                 section = i;
                 if ( typeof(obj[i]) == 'object' && !Array.isArray(obj[i]) && obj[i] !== null ) { // parse
 
@@ -17431,7 +17541,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     if (!hasParent ) {
                         id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
-                        if (i == 'params') { // force to top 
+                        if (i == 'params') { // force to top
                             var htmlParams =    '<div id="gina-toolbar-view-'+ id.substr(0, id.length - 1) +'" class="gina-toolbar-section">' +
                                                     '<h2 class="gina-toolbar-section-title">'+ id.substr(0, id.length - 1) +'</h2>' +
                                                     '<ul class="'+ id.substr(0, id.length - 1) +'"></ul>' +
@@ -17440,9 +17550,9 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                             $('#gina-toolbar-view-html-properties')
                                 .before(htmlParams);
                         } else {
-                            
+
                             if ( !/^html/.test(id) ) {
-                                
+
                                 var htmlOther = '<div id="gina-toolbar-view-'+ id.substr(0, id.length - 1) +'" class="gina-toolbar-section">' +
                                                 '<h2 class="gina-toolbar-section-title">'+ id.substr(0, id.length - 1) +'</h2>' +
                                                 '<ul class="'+ id.substr(0, id.length - 1) +'"></ul>' +
@@ -17455,7 +17565,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                                     .find('.gina-toolbar-properties')
                                     .append('ul.' + id.substr(0, id.length - 1))
                             }*/
-                            
+
                         }
 
                         parseView(obj[i], ginaObj[i], id, elIsXHR, $html.find('ul.'+ id.substr(0, id.length - 1)), $root );
@@ -17480,14 +17590,14 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
 
                 } else if ( Array.isArray(obj[i]) ) { // parse collection
 
-                    
-                    
+
+
                     $parent = $('#gina-toolbar-view-' + id.substr(0, id.length - 1));
-                    
+
                     hasParent = ( $parent.length ) ? true : false;
-                    
-                    if ( !hasParent || /^html/.test(id) ) {                        
-                        
+
+                    if ( !hasParent || /^html/.test(id) ) {
+
                         $parent = $('.' + id);
                         parentId = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
@@ -17495,17 +17605,17 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                             //.find('ul.'+ id.substr(0, id.length - 1))
                             .append('<li class="gina-toolbar-collection"><a href="#" class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substr(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul> '+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substr(0, id.length - 1)), section )+'</ul></li>');
 
-                        
+
                         //parentId = parentId.substr(0, parentId.length - 1)+ '-';
-                        //parentId = id.substr(0, id.length - i.length - 1);     
+                        //parentId = id.substr(0, id.length - i.length - 1);
                         //parseView(obj[i], ginaObj[i], parentId, elIsXHR, $parent.find('ul.'+ parentId.substr(0, parentId.length - 1)), $root );
 
                         //id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
                         //$parent = $('#gina-toolbar-view-' + id.substr(0, id.length - 1));
                         id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
-                    } else {                       
-                        
-                        
+                    } else {
+
+
                         parentId = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
                         $parent
@@ -17513,20 +17623,20 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                             .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), parentId.substr(0, parentId.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $parent.find('li ul.'+ id.substr(0, id.length - 1)), section ) +'</ul></li>');
 
                         id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
-                        
+
                     }
-                    
 
-                    // if ( !hasParent || /^html/.test(id) ) {                        
+
+                    // if ( !hasParent || /^html/.test(id) ) {
                     //     id = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
                     //     $root
                     //         .find('.gina-toolbar-properties')
                     //         .append('<li class="gina-toolbar-collection"><a class="gina-toolbar-key gina-toolbar'+ isXHR +'-folding-state-'+ normalizeFoldingStateName( i.replace(/[^A-Za-z0-9_-]/g, '_'), id.substr(0, id.length - 1) ) +'">'+ i +' <span>['+ obj[i].length +']</span></a><ul>'+ parseCollection(obj[i], ginaObj[i], parentId, $root.find('.gina-toolbar-properties'), section) +'</ul></li>');
 
 
-                    // } else {                       
-                        
-                        
+                    // } else {
+
+
                     //     parentId = id + i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
 
                     //     $parent
@@ -17539,17 +17649,17 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     // clear one level
                     id = id.substr(0, id.length - i.length - 1);
                 } else {
-                    
-                    
-                    
+
+
+
                     objType = (ginaObj[i] === null) ? 'null' : typeof(ginaObj[i]);
                     if ( objType == 'undefined' ) { // new key  declaration added by user
                         if (/\-$/.test(id)) {
                             id = id.substr(0, id.length - 1);
                         }
-                        
+
                         if (!id) continue;
-                        
+
                         $html
                             .find('ul.' + id)
                             .append('<li class="gina-toolbar-key-value"><span class="gina-toolbar-key gina-toolbar-key-added">'+ i +':</span> <span class="gina-toolbar-value gina-toolbar-value-type-is-'+ objType +'">'+ obj[i]+'</span></li>');
@@ -17562,7 +17672,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                             if (!id) {
                                 id += i.replace(/[^A-Za-z0-9_-]/g, '_') + '-';
                             }
-                            
+
                             try {
                                 $html
                                     .find('ul.' + id)
@@ -17575,7 +17685,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                             } catch (err) {
                                 throw new Error('GinaToolbarError: `ul.'+ id +'` not found');
                             }
-                            
+
                         } else {
 
                             if ( !id || /^html\-properties/.test(id) ) { // properties case
@@ -17587,10 +17697,10 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                                     $root
                                         .find('.gina-toolbar-properties')
                                         .append('<li class="gina-toolbar-key-value"><span class="gina-toolbar-key">'+ i +':</span> <span class="gina-toolbar-value gina-toolbar-value-type-is-'+ objType +'">'+ obj[i] +'</span></li>')
-                                //}                                
-                                    
+                                //}
+
                             } else {
-                                                            
+
                                 $root
                                     .find('ul.' + id.substr(0, id.length - 1))
                                     .append('<li class="gina-toolbar-key-value"><span class="gina-toolbar-key">'+ i +':</span> <span class="gina-toolbar-value gina-toolbar-value-type-is-'+ objType +'">'+ obj[i] +'</span></li>')
@@ -17607,9 +17717,9 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
 
             return parseObject(rules, rules, id, elIsXHR, section)
         }
-        
+
         var parseUrls = function(section) {
-            
+
             var $el = null;
             var $currentPopin = (gina.hasPopinHandler) ? gina.popin.getActivePopin() : null;
             var isPopinContext = ( gina.hasPopinHandler ) ? true : false;
@@ -17618,7 +17728,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             } else {
                 $el = $('body');
             }
-            
+
             // look for `404: `
             var found = {}
                 , foundStr = null
@@ -17632,19 +17742,19 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                 for (; f < fLen; ++f) {
                     foundStr = matched[f].replace(/\"(.*)|\"/g, '');
                     formMethod = foundStr.match(/\[(.*)\]/g, '')[0].replace(/\[|\]/g,'');
-                    
+
                     routing.getRouteByUrl(foundStr, formMethod)
                 }
-            } 
-               
+            }
+
             printLogs();
-            
+
             //console.debug('popinIsActive: '+ isPopinContext +'isXHR: ', self.isXHR, ' -> ' + section, routing.notFound);
         }
-        
+
         var printLogs = function() {
             fLen = routing.notFound.count();
-            if ( fLen > 0 ) {                
+            if ( fLen > 0 ) {
                 for (f in routing.notFound) {
                     console.warn( '(x'+ routing.notFound[f].count +') ' + f + ' => ' + routing.notFound[f].message );
                 }
@@ -17652,13 +17762,13 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
         }
 
         var parseForms = function (obj, ginaObj, $html, i, $forms, len, elIsXHR) {
-            
+
             if (!len) return false;
 
             var attributes  = $forms[i].attributes;
             var formMethod  = null;
             var attrClass   = 'gina-toolbar-form-attributes';
-            var id = $forms[i].getAttribute('id') || $forms[i].id;            
+            var id = $forms[i].getAttribute('id') || $forms[i].id;
             var section     = attrClass; // by default
             var isXHR       = ( typeof(elIsXHR) != 'undefined' && elIsXHR != null ) ? '-xhr' : '';
             // form fields set
@@ -17684,8 +17794,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                 , routeObj  = null
             ;
 
-            // testing for action attr to add action route            
-           
+            // testing for action attr to add action route
+
 
             // adding form attributes
             for ( var a = 0, aLen = attributes.length; a < aLen; ++a ) {
@@ -17701,14 +17811,14 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     val = '<ul><li>'+ val.replace(/\s+/g, '</li><li>') +'</li></ul>';
 
                 if ( /^action$/.test(key) ) {
-                    
-                    formMethod  = ( typeof(attributes['method']) != 'undefined' ) ? attributes['method'].nodeValue : undefined;   
-                    
+
+                    formMethod  = ( typeof(attributes['method']) != 'undefined' ) ? attributes['method'].nodeValue : undefined;
+
                     if (!formMethod) {
-                        console.warn('[ ToolbarFormHelper::UndefinedMethod : form `'+ attributes['id'].nodeValue +'` method attribute cannot be left undefined !');                        
+                        console.warn('[ ToolbarFormHelper::UndefinedMethod : form `'+ attributes['id'].nodeValue +'` method attribute cannot be left undefined !');
                     }
-                    
-                    routeObj    = routing.getRouteByUrl(val, formMethod);                    
+
+                    routeObj    = routing.getRouteByUrl(val, formMethod);
 
                     if ( typeof(routeObj) == 'undefined' || !routeObj ) {
                         routeObj = {
@@ -17719,8 +17829,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                                 file: 'not found'
                             }
                         }
-                    } 
-                    
+                    }
+
                     val =   '<ul>' +
                                 '<li>' +
                                     '<span class="gina-toolbar-key">url</span>' +
@@ -17773,7 +17883,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
 
                     }
 
-                    
+
                     content =   '<li>' +
                                     '<span class="gina-toolbar-key">'+ key +':</span>' +
                                     '<span class="gina-toolbar-value">'+ val +'</span>' +
@@ -17808,15 +17918,15 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             var rules = null;
 
             try {
-                
+
                 var dataRule = $forms[i].getAttribute('data-gina-form-rule');
-                
+
                 if ( typeof(dataRule) != 'undefined' && dataRule!= null ) {
                     rules = eval('gina.forms.rules.' + dataRule.replace(/-/g, '.'))
                 } else {
                     rules = eval('gina.forms.rules.' + id.replace(/-/g, '.'))
                 }
-                
+
             } catch (err) {}
 
             if ( rules ) {
@@ -17826,8 +17936,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                     .append('<li class="gina-toolbar-form-'+ section +'">' +
                                 '<h3 class="gina-toolbar-sub-section-title">'+ section +'</h3>' +
                                 '<ul class="gina-toolbar-properties">'+ parseSection( rules, id, elIsXHR, section ) +'</ul>' +
-                            '</li>');                
-                
+                            '</li>');
+
             }
 
 
@@ -17878,7 +17988,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             if ( !$sectionContent.is(':visible') ) {
                 $sectionContent.slideToggle()
             }
-            
+
         }
 
         var createInputFile = function(id, label) {
@@ -17988,13 +18098,13 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             if (lastJsonObjectState && typeof (lastJsonObjectState.data) != 'undefined' ) {
                 originalData.jsonObject.data = lastJsonObjectState.data;
             }
-            
+
             loadData('data', originalData.jsonObject, originalData.ginaJsonObject);
             self.hasParsedUrls = false;
             routing.notFound = {};
         }
 
-        
+
         if ( typeof(gina.validator) != 'undefined' ) {
             gina.validator.on('initialized', function onValidatorReady(){
                 console.log('toolbar validator ready');
@@ -18002,8 +18112,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             })
         } else {
             init();
-        }       
-        
+        }
+
     }
 
     return Toolbar
@@ -19423,10 +19533,10 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
         function updateToolbar(result, resultIsObject) {
             // update toolbar errors
             var $popin = getActivePopin();
-
+            var XHRData = null;
             if ( gina && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar && typeof(result) != 'undefined' && typeof(resultIsObject) != 'undefined' && result ) {
 
-                var XHRData = result;
+                XHRData = result;
 
                 try {
                     var XHRDataNew = null;
@@ -19461,7 +19571,7 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
 
             // update toolbar
             try {
-                var $popin = getPopinById(instance.activePopinId);
+                $popin = getPopinById(instance.activePopinId);
                 var $el = $popin.target;
             } catch (err) {
                 ginaToolbar.update('data-xhr', err );
@@ -19469,7 +19579,7 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
 
 
             // XHRData
-            var XHRData = null;
+            XHRData = null;
             if ( typeof(result) == 'string' && /\<(.*)\>/.test(result) ) {
                 // converting Element to DOM object
                 XHRData = new DOMParser().parseFromString(result, 'text/html').getElementById('gina-without-layout-xhr-data');
@@ -19510,6 +19620,7 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
                         // reset data-xhr
                         //ginaToolbar.update("view-xhr", null);
                         ginaToolbar.update('view-xhr', XHRView);
+                        return;
                     }
 
                     // popin content
@@ -19602,7 +19713,14 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
                     // proxy external urls
                     // TODO - instead of using `cors.io` or similar services, try to intégrate a local CORS proxy similar to : http://oskarhane.com/avoid-cors-with-nginx-proxy_pass/
                     //url = url.match(/^(https|http)\:/)[0] + '//cors.io/?' + url;
-                    url = url.match(/^(https|http)\:/)[0] + '//corsacme.herokuapp.com/?'+ url;
+
+
+                    // url = url.match(/^(https|http)\:/)[0] + '//corsacme.herokuapp.com/?'+ url;
+                    // url = url.match(/^(https|http)\:/)[0] + '//localhost:4100/proxy/?'+ url;
+                    url = 'http://localhost:4100/proxy/?'+ url;
+
+
+
                     //url = url.match(/^(https|http)\:/)[0] + '//cors-anywhere.herokuapp.com/' + url;
 
                     //delete options.headers['X-Requested-With']
@@ -19616,7 +19734,7 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
             // updating popin options
             $popin.options  = merge(options, $popin.options);
 
-
+            var result = null;
             if ( options.withCredentials ) { // Preflighted requests
                 if ('withCredentials' in xhr) {
                     // XHR for Chrome/Firefox/Opera/Safari.
@@ -19632,7 +19750,7 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
                 } else {
                     // CORS not supported.
                     xhr = null;
-                    var result = 'CORS not supported: the server is missing the header `"Access-Control-Allow-Credentials": true` ';
+                    result = 'CORS not supported: the server is missing the header `"Access-Control-Allow-Credentials": true` ';
                     triggerEvent(gina, $el, 'error.' + id, result)
                 }
             } else { // simple requests
@@ -19645,7 +19763,7 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
             }
 
 
-
+            var resultIsObject = false;
             if (xhr) {
                 // setting up headers
                 xhr.withCredentials = ( typeof(options.withCredentials) != 'undefined' ) ? options.withCredentials : false;
@@ -19653,12 +19771,12 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
                 xhr.onerror = function(event, err) {
 
                     var error = 'Transaction error: might be due to the server CORS settings.\nPlease, check the console for more details.';
-                    var result = {
+                    result = {
                         'status':  xhr.status, //500,
                         'error' : error
                     };
 
-                    var resultIsObject = true;
+                    resultIsObject = true;
                     instance.eventData.error = result +'\n'+ err;
                     updateToolbar(result, resultIsObject);
                     triggerEvent(gina, $el, 'error.' + id, result)
@@ -19674,11 +19792,11 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
                 xhr.onreadystatechange = function (event) {
                     if (xhr.readyState == 4) {
                         // 200, 201, 201' etc ...
+                        var result = null
                         if( /^2/.test(xhr.status) ) {
-
                             try {
-                                var result          = xhr.responseText
-                                    , contentType   = xhr.getResponseHeader("Content-Type")
+                                result = xhr.responseText;
+                                var contentType   = xhr.getResponseHeader("Content-Type")
                                     , isJsonContent = (/application\/json/.test( contentType )) ? true : false
                                     , isRedirecting = true // by default
                                 ;
@@ -19788,10 +19906,15 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
                                         //return
                                     //}
                                     if ( !isJsonContent ) {
+                                        if (GINA_ENV_IS_DEV)
+                                            updateToolbar(result);
                                         triggerEvent(gina, $el, 'loaded.' + id, result);
                                         return
                                     }
 
+                                    if (GINA_ENV_IS_DEV)
+                                            updateToolbar(result);
+
                                     triggerEvent(gina, $forms[0], 'success.' + id, result);
 
                                 }
@@ -19801,9 +19924,9 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
 
                             } catch (err) {
 
-                                var resultIsObject = false;
+                                resultIsObject = false;
 
-                                var result = {
+                                result = {
                                     'status':  422,
                                     'error' : err.description || err.stack
                                 };
@@ -19822,8 +19945,8 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
 
                         } else {
                             //console.log('error event triggered ', event.target, $form);
-                            var resultIsObject = false;
-                            var result = {
+                            resultIsObject = false;
+                            result = {
                                 'status':  xhr.status,
                                 'error' : xhr.responseText
                             };
@@ -20030,8 +20153,8 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
             instance.activePopinId = $popin.id;
 
             // update toolbar
-            if (GINA_ENV_IS_DEV)
-                updateToolbar();
+            // if (GINA_ENV_IS_DEV)
+            //     updateToolbar();
             // var XHRData = document.getElementById('gina-without-layout-xhr-data');
             // if ( gina && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar && XHRData ) {
             //     try {