gina 0.1.1-alpha.162 → 0.1.1-alpha.164

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.164}/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');
         }
     }
 
@@ -16577,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() {
@@ -16748,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) {
@@ -16838,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>');
@@ -16851,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
@@ -16869,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;
@@ -16880,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]);
@@ -16910,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 ) );
@@ -16927,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
@@ -16949,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)
@@ -16977,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) {
@@ -17004,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);
-            }                
+            }
         }
 
 
@@ -17147,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
@@ -17177,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
@@ -17256,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
             }
@@ -17268,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 {
@@ -17278,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') ) {
@@ -17301,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 )
@@ -17351,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
@@ -17363,7 +17374,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
                         .replace(/\]/, '')
                         .replace(/[^A-Za-z0-9_-]/g, '_')
                 }
-                
+
                 foldingStateName += section + '-'
             }
 
@@ -17375,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()
         }
 
@@ -17460,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]
                     }
@@ -17504,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' : '';
@@ -17520,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
 
@@ -17530,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>' +
@@ -17539,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>' +
@@ -17554,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 );
@@ -17579,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, '_') + '-';
 
@@ -17594,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
@@ -17612,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
@@ -17638,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>');
@@ -17661,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)
@@ -17674,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
@@ -17686,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>')
@@ -17706,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;
@@ -17717,7 +17728,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             } else {
                 $el = $('body');
             }
-            
+
             // look for `404: `
             var found = {}
                 , foundStr = null
@@ -17731,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 );
                 }
@@ -17751,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
@@ -17783,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 ) {
@@ -17800,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 = {
@@ -17818,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>' +
@@ -17872,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>' +
@@ -17907,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 ) {
@@ -17925,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>');
+
             }
 
 
@@ -17977,7 +17988,7 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             if ( !$sectionContent.is(':visible') ) {
                 $sectionContent.slideToggle()
             }
-            
+
         }
 
         var createInputFile = function(id, label) {
@@ -18087,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');
@@ -18101,8 +18112,8 @@ define('gina/toolbar', ['require', 'jquery', 'vendor/uuid'/**, 'utils/merge'*/,
             })
         } else {
             init();
-        }       
-        
+        }
+
     }
 
     return Toolbar
@@ -18312,12 +18323,453 @@ function BindingHelper(handlerContext) {
 }
 // Publish as AMD module
 define( 'helpers/binding',[],function() { return BindingHelper });
-define('gina/link', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/events' ], function (require) {
+/*
+ * This file is part of the gina package.
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// nodejs dependencies
+if ( typeof(module) !== 'undefined' && module.exports) {
+    var fs              = require('fs');
+    var execSync        = require('child_process').execSync;
+    var util            = require('util');
+    var promisify       = util.promisify;
+    try {
+        // With gina framework only
+        var console         =  require('../../logger');
+    } catch (err) {}
+}
+/**
+ * Domain
+ * Credits & thanks to the Mozilla Community :)
+ * https://publicsuffix.org/
+ *
+ * This lib is using Fetch API (NodeJS >= 18.0.0)
+ * See: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#browser_compatibility
+ *
+ * TODO - Write a cron to periodically check updates from `https://publicsuffix.org/`
+ * TODO - Finalize AMD module support
+ * TODO - Replace execSync of `curl` to a NodeJS based synchronous request
+ *
+ * @param {string} [options] - {
+ *          // `.dat` configuration filename
+ *          filename: "./dist/public_suffix_list.dat",
+ *          // trigger PSL update pulling
+ *          isUpdating: false
+ *      }
+ */
+function Domain(options, cb) {
+
+    var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
+    // Detect if user is on IE browser
+    var isIE            = false;
+    if (isGFFCtx) {
+        isIE = !!window.MSInputMethodContext && !!document.documentMode;
+    }
+
+    if ( typeof(arguments[0]) == 'function' ) {
+        cb = arguments[0];
+        options = undefined;
+    }
+
+    var defaultOptions  = {
+        // if isGFFCtx, should be place in the public folder to be served by your own host
+        // e.g.: "./public_suffix_list.dat" located under "/my-www-folder/"
+        filename            : "../dist/public_suffix_list.dat",
+        url                 : "https://publicsuffix.org/list/public_suffix_list.dat",
+        alternativeUrl      : "https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat",
+        // only available from backend calls
+        isCachingRrequired  : false,
+        isUpdating          : false
+    }
+
+    var self = {
+        options : null,
+        rawPSL  : null,
+        PSL     : [],
+    };
+
+
+    var init = function(proto, options, cb) {
+        if ( typeof(options) == 'undefined' ) {
+            options = defaultOptions
+        } else {
+            // merge options
+            for(let opt in defaultOptions) {
+                if ( typeof(options[opt]) == 'undefined' ) {
+                    options[opt] = defaultOptions[opt];
+                }
+            }
+        }
+
+        if (!isGFFCtx) {
+            options.filename = __dirname +'/'+ options.filename;
+        }
+
+        if (isGFFCtx && options.isCachingRrequired ) {
+            console.warn('[DOMAIN] `options.isCachingRrequired` is only available for backend');
+            options.isCachingRrequired = false
+        }
+
+        self.options = options;
+
+        if (cb) {
+            return loadPSL(options, function onPSLLoaded(err) {
+                if (err) {
+                    cb(err);
+                    return
+                }
+
+                console.debug('[DOMAIN] PSL Loaded');
+                // return proto
+
+                cb(err, proto)
+            });
+        }
+
+        // Assuming that you have previously initialized Domain
+        loadPSL(options);
+        console.debug('[DOMAIN] PSL Loaded');
+        return proto
+    }
+
+    // TODO - for frontend calls only
+    var onReady = function() {
+
+    }
+
+    var loadPSL = async function(opt, cb) {
+        var filenameOrUrl   = (isGFFCtx || opt.isCachingRrequired) ? opt.url : opt.filename;
+        var isUpdating      = ( typeof(opt.isUpdating) != 'undefined' ) ? opt.isUpdating : false;
+        var err             = null;
+
+        if (isGFFCtx) {
+
+            if (self.rawPSL && !isUpdating) {
+                cb(false);
+                return;
+            }
+
+            if (!window.fetch) {// just in case
+                err = new Error('[DOMAIN] Fetch API not supported');
+                cb(err);
+                return;
+            }
+
+            var response = null
+                , result = null
+            ;
+            try {
+                response    = await fetch(filenameOrUrl);
+                result      = await response.text();
+
+                self.rawPSL = result;
+            } catch (PSLErr) {
+                // There was an error
+                // console.warn('[DOMAIN] Could not load PSL', err.stack || err.message || err);
+                err = new Error('[DOMAIN] Could not load PSL\n'+ (PSLErr.stack || PSLErr.message || PSLErr) );
+                cb(err);
+                return;
+            }
+
+            opt.isUpdating = false;
+            cb(false);
+
+            return;
+        }
+
+        // file exists ?
+        var exists = false;
+        if ( typeof(fs.accessSync) != 'undefined' ) {
+            try {
+                fs.accessSync(opt.filename, fs.constants.F_OK);
+                exists = true;
+            } catch (err) {
+                exists = false;
+                // to handle symlinks
+                try {
+                    if ( fs.lstatSync(opt.filename).isSymbolicLink() ) {
+                        exists = true
+                    }
+                } catch (linkErr) {}
+            }
+        } else { // support for old version of nodejs
+            exists = fs.existsSync(opt.filename);
+        }
+
+        if (!exists) {
+            opt.isCachingRrequired = true;
+        }
+
+        if (opt.isCachingRrequired) { // Fetch is only supported from NodeJS >= 18.0.0
+            var cmd = 'curl -o '+opt.filename +' '+ opt.url +' >/dev/null 2>&1';
+            console.debug('[DOMAIN] Running: '+ cmd);
+            try {
+                execSync(cmd);
+            } catch (err) {
+                console.warn('[DOMAIN] could not fetch from `'+ opt.url +'`. Trying with `'+ opt.alternativeUrl +'`');
+                cmd = 'curl -o '+opt.filename +' '+ opt.alternativeUrl +' >/dev/null 2>&1';
+                try {
+                    execSync(cmd);
+                } catch (altErr) {
+                    cb(altErr);
+                    return;
+                }
+            }
+            // Waiting for the file to be written
+            var found = false;
+            nIntervId = setInterval(() => {
+                // Check for modules availability
+                if ( typeof(fs.accessSync) != 'undefined' ) {
+                    try {
+                        fs.accessSync(opt.filename, fs.constants.F_OK);
+                        found = true;
+                    } catch (err) {
+                        found = false;
+                        // to handle symlinks
+                        try {
+                            if ( fs.lstatSync(opt.filename).isSymbolicLink() ) {
+                                found = true
+                            }
+                        } catch (linkErr) {}
+                    }
+                } else { // support for old version of nodejs
+                    found = fs.existsSync(opt.filename);
+                }
+
+                if ( found ) {
+                    clearInterval(nIntervId);
+                    self.rawPSL = fs.readFileSync(opt.filename).toString();
+                    cb(false);
+
+                    return
+                }
+            }, 200);
+
+
+            // TODO - Synchronize this instead of using CURL
+            // var http = require('http');
+
+            // var port = 80;
+            // var urlArr = opt.url.match(/^(http|https)\:\/\/(.*)\//)[0].split(/\//g);
+            // if ( /\:\d+$/.test(urlArr[1]) ) {
+            //     port = ~~(urlArr[1].match(/\:\d+$/)[0].replace(/^\:/, ''));
+            //     urlArr[1] = urlArr[1].replace(/\:\d+$/, '');
+            // }
+            // var hostname = urlArr[0] +'//'+ urlArr[1];
+            // var path = '/'+ opt.url.split(/\//g).splice(3).join("/");
+
+            // var data = '';
+
+            // var requestOpt = {
+            //     hostname: hostname,
+            //     port: port,
+            //     path: path,
+            //     method: 'GET'
+            // };
+
+            // var req = await http.request(options, (res) => {
+            //     res.setEncoding('utf8');
+            //     res.on('data', (chunk) => {
+            //         console.log(`BODY: ${chunk}`);
+            //         data += chunk;
+            //     });
+            //     res.on('end', () => {
+            //         console.log('No more data in response.');
+            //     });
+            // });
+
+            // req.on('error', (e) => {
+            //     console.error(`problem with request: ${e.message}`);
+            // });
+
+            // req.end();
+
+            // self.rawPSL = data.toString();
+
+
+
+        }
+
+        // Just in case some one delete it once `Domain` has been inatialized
+        try {
+            self.rawPSL = fs.readFileSync(opt.filename).toString();
+            if (cb)
+                cb(false)
+        } catch (err) {
+            console.warn('[DOMAIN] could not read from `'+ opt.filename +'`');
+            loadPSL(options, cb)
+        }
+    }
+
+    var updatePSL = function(cb) {
+        self.options.isUpdating = true;
+        loadPSL(self.options, cb);
+    }
+
+
+    /**
+     * Load a json file and removing comments if found
+     *
+     * @return {string} filename - path
+     * @return {boolean} [jsonFormat] - false by default
+     * */
+    var getRootDomain = function(urlOrHostname, jsonFormat) {
+        if ( typeof(jsonFormat) == 'undefined' ) {
+            jsonFormat = false
+        }
+        var isSLD = false
+            , isRegisteredTldOrSld = false
+            , rootDomain = urlOrHostname.replace(/^(.*)\:\/\/|\/(.*)/g, '')
+            // we don't want sub domains: that's why the `.reverse()` is for
+            , rootDomainArr = rootDomain.split(/\./g).reverse()
+            // TLD by default
+            , rootDomainIndex = (rootDomainArr.length) ? rootDomainArr.length-1 : 0
+        ;
+
+        var list = self.rawPSL
+                // remove comments & empty lines
+                .replace(/\/\/\s*(.*)\n|^\s*\n/gm, '')
+                .split(/\n/)
+                .filter( function onFiltered(item, i, iArr) {
+                    // formating ^!, ^. & removing extra junk
+                    // this is specific to the ginven extensions list
+                    if ( /[^a-z 0-9.]+/.test(item) ) {
+                        item = item.replace(/[^a-z 0-9.]+/g, '').replace(/^\./g, '');
+                    }
+
+                    // retain only SLD
+                    if ( /\./.test(item) ) {
+                        if ( !isSLD && new RegExp('.'+item +'$').test(rootDomain) ) {
+                            // Found SLD
+                            isSLD = true;
+                            // console.debug('Found '+ item);
+                            rootDomainIndex = item.split(/\./g).length;
+                            // Stop here
+                            iArr.splice(0, iArr.length);
+                            return false;
+                        }
+
+                        return item
+                    }
+                    // also get tld to check later if valid/registered
+                    return item
+                });
+
+        // Local or unregistered domain
+        rootDomain = rootDomainArr[rootDomainIndex];
+
+        // TLD & SLD
+        if (rootDomainIndex > 0 ) {
+            // rootDomainArr  = rootDomainArr.splice(0, rootDomainIndex);
+            // rootDomain += '.'+ rootDomainArr.reverse().join('.');
+
+            rootDomainArr  = rootDomainArr.splice(0, rootDomainIndex);
+            var suffix = rootDomainArr[0];
+            // Remove port number
+            if ( /\:(.*)$/.test(suffix) ) {
+                suffix = suffix.replace(/\:(.*)$/, '');
+            }
+            isRegisteredTldOrSld = ( isSLD || !isSLD && list.indexOf(suffix) > -1 ) ? true : false;
+            if (isRegisteredTldOrSld /**&& isSLD || !isSLD && list.indexOf(suffix) < 0*/ ) {
+                if (rootDomainIndex > 1 && !isSLD) {
+                    // This is a TLD
+                    rootDomainArr.splice(2);
+                    rootDomain = rootDomainArr.reverse().join('.');
+                } else {
+                    rootDomain += '.'+ rootDomainArr.reverse().join('.');
+                }
+
+            } else {
+                if (rootDomainIndex > 1) {
+                    // Only allowing pseudo TLD here
+                    rootDomainArr.splice(2);
+                    rootDomain = rootDomainArr.reverse().join('.');
+                } else {
+                    rootDomain += '.'+ rootDomainArr.reverse().join('.');
+                }
+            }
+        }
+
+        // Remove port number
+        if ( /\:(.*)$/.test(rootDomain) ) {
+            rootDomain = rootDomain.replace(/\:(.*)$/, '');
+        }
+
+        console.debug('[DOMAIN] isSLD: '+ isSLD, urlOrHostname, ' -> ', rootDomain);
+        if ( /^true$/i.test(jsonFormat) ) {
+            return {
+                value               : rootDomain,
+                isSLD               : isSLD,
+                isRegisteredTldOrSld: isRegisteredTldOrSld
+            }
+        }
+        return rootDomain
+    }
+
+    // Both backend & frontend
+    var _proto = {
+        getRootDomain   : getRootDomain
+    };
+    // Backend proto only
+    if (!isGFFCtx) {
+        _proto.updatePSL = updatePSL;
+    }
+    // Frontend only
+    else {
+        _proto.onReady = onReady;
+    }
+
+
+    if (isGFFCtx && isIE && !window.fetch) {
+        // Create Promise polyfill script tag
+        var promiseScript = document.createElement("script");
+        promiseScript.type = "text/javascript";
+        promiseScript.src =
+            "https://cdn.jsdelivr.net/npm/promise-polyfill@8.1.3/dist/polyfill.min.js";
+
+        // Create Fetch polyfill script tag
+        var fetchScript = document.createElement("script");
+        fetchScript.type = "text/javascript";
+        fetchScript.src =
+            "https://cdn.jsdelivr.net/npm/whatwg-fetch@3.4.0/dist/fetch.umd.min.js";
+
+        // Add polyfills to head element
+        document.head.appendChild(promiseScript);
+        document.head.appendChild(fetchScript);
+
+        // Wait for the polyfills to load and run the function.
+        // TODO - add a setinterval to trigger `onFetchReady`event
+        return setTimeout(() => {
+            return init(_proto, options, cb)
+        }, 500);
+    } else {
+        return init(_proto, options, cb)
+    }
+
 
-    var $       = require('jquery');
+
+}//EO Domain.
+
+if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
+    // Publish as node.js module
+    module.exports = Domain
+} else if ( typeof(define) === 'function' && define.amd) {
+    // Publish as AMD module
+    define( 'utils/domain',[],function() { return Domain })
+}
+;
+define('gina/link', [ 'require', 'jquery', 'vendor/uuid', 'utils/domain', 'utils/merge', 'utils/events' ], function (require) {
+
+    var $               = require('jquery');
     $.noConflict();
-    var uuid    = require('vendor/uuid');
-    var merge   = require('utils/merge');
+    var uuid            = require('vendor/uuid');
+    var Domain          = require('utils/domain');
+    var domainInstance  = null;
+    var merge           = require('utils/merge');
 
     require('utils/events'); // events
 
@@ -18462,9 +18914,14 @@ define('gina/link', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/e
                 //options.headers['Origin']   = window.protocol+'//'+window.location.host;
                 //options.headers['Origin']   = '*';
                 //options.headers['Host']     = 'https://freelancer-app.fr.local:3154';
-                var isSameDomain = ( new RegExp(window.location.hostname).test(url) ) ? true : false;
+                var hostRootDomain  = domainInstance.getRootDomain(window.location.hostname).value;
+                var urlRootDomain   = domainInstance.getRootDomain(url).value;
+                var isSameDomain    = (hostRootDomain === urlRootDomain) ? true : false;
+                // var isSameDomain    = ( new RegExp(window.location.hostname).test(url) ) ? true : false;
+
                 if (gina.config.envIsDev) {
-                    console.debug('Checking CORS from Link plugin...\TODO - local CORS Proxy');
+                    console.debug('Checking CORS from Popin plugin...\TODO - local CORS Proxy');
+                    console.debug('Is request from same domain ? ', isSameDomain);
                 }
                 if (!isSameDomain) {
                     // proxy external urls
@@ -18790,18 +19247,28 @@ define('gina/link', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/e
             instance.getLinkByUrl   = getLinkByUrl;
         }
 
+        new Domain( function onReady(err, _domainInstance) {
+            if (err) {
+                throw err
+            }
+
+            domainInstance = _domainInstance;
+        });
+
         return init(options)
-    };
+    }
 
     return Link
 });
-define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/routing', 'utils/events' ], function (require) {
+define('gina/popin', [ 'require', 'jquery', 'vendor/uuid', 'utils/domain', 'utils/merge', 'utils/routing', 'utils/events' ], function (require) {
 
-    var $       = require('jquery');
+    var $               = require('jquery');
     $.noConflict();
-    var uuid    = require('vendor/uuid');
-    var merge   = require('utils/merge');
-    var routing = require('utils/routing');
+    var uuid            = require('vendor/uuid');
+    var Domain          = require('utils/domain');
+    var domainInstance  = null;
+    var merge           = require('utils/merge');
+    var routing         = require('utils/routing');
 
     require('utils/events'); // events
 
@@ -19522,10 +19989,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;
@@ -19560,7 +20027,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 );
@@ -19568,7 +20035,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');
@@ -19609,6 +20076,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
@@ -19693,16 +20161,25 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
                 //options.headers['Origin']   = window.protocol+'//'+window.location.host;
                 //options.headers['Origin']   = '*';
                 //options.headers['Host']     = 'https://domain.local:3154';
-                var isSameDomain = ( new RegExp(window.location.hostname).test(url) ) ? true : false;
+                var hostRootDomain  = domainInstance.getRootDomain(window.location.hostname).value;
+                var urlRootDomain   = domainInstance.getRootDomain(url).value;
+                var isSameDomain    = (hostRootDomain === urlRootDomain) ? true : false;
+                // var isSameDomain    = ( new RegExp(window.location.hostname).test(url) ) ? true : false;
+
                 if (gina.config.envIsDev) {
                     console.debug('Checking CORS from Popin plugin...\TODO - local CORS Proxy');
+                    console.debug('Is request from same domain ? ', isSameDomain);
                 }
                 if (!isSameDomain) {
                     // 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] + '//cors-anywhere.herokuapp.com/' + url;
+                    // url = url.match(/^(https|http)\:/)[0] + '//localhost:4100/proxy/?'+ url;
+
+
 
                     //delete options.headers['X-Requested-With']
 
@@ -19715,7 +20192,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.
@@ -19731,7 +20208,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
@@ -19744,7 +20221,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;
@@ -19752,12 +20229,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)
@@ -19773,11 +20250,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
                                 ;
@@ -19887,10 +20364,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);
 
                                 }
@@ -19900,9 +20382,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
                                 };
@@ -19921,8 +20403,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
                             };
@@ -20129,8 +20611,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 {
@@ -20451,8 +20933,16 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid','utils/merge', 'utils/
             popinGetContainer()
         }
 
+        new Domain( function onReady(err, _domainInstance) {
+            if (err) {
+                throw err
+            }
+
+            domainInstance = _domainInstance;
+        });
+
         return init(options)
-    };
+    }
 
     return Popin
 });