gina 0.1.1-alpha.168 → 0.1.1-alpha.169

package/framework/v0.1.1-alpha.169/VERSION

@@ -0,0 +1 @@
+0.1.1-alpha.169

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

@@ -20034,8 +20034,9 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid', 'lib/domain', 'lib/me
 
         function updateToolbar(result, resultIsObject) {
             // update toolbar errors
-            var $popin = getActivePopin();
+            var $popin  = getActivePopin();
             var XHRData = null;
+            var $el     = null;
             if ( gina && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar && typeof(result) != 'undefined' && typeof(resultIsObject) != 'undefined' && result ) {
 
                 XHRData = result;
@@ -20065,6 +20066,7 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid', 'lib/domain', 'lib/me
 
                     XHRData.isXHRViewData = true;
                     ginaToolbar.update('data-xhr', XHRData );
+
                     return;
                 } catch (err) {
                     throw err
@@ -20072,11 +20074,23 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid', 'lib/domain', 'lib/me
             }
 
             // update toolbar
+
             try {
                 $popin = getPopinById(instance.activePopinId);
-                var $el = $popin.target;
+                $el = $popin.target;
             } catch (err) {
-                ginaToolbar.update('data-xhr', err );
+                if ($popin) {
+                    ginaToolbar.update('data-xhr', err );
+                }
+            }
+            // XHR - case; popin is in the result, but not loaded yet
+            if (!$popin) {
+                var popinObject = new DOMParser().parseFromString(result, 'text/html').getElementsByClassName('popin')[0];
+                $popin = {
+                    id      : popinObject.id,
+                    target  : popinObject
+                };
+                $el = $popin.target;
             }
 
 
@@ -20120,19 +20134,17 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid', 'lib/domain', 'lib/me
 
                         XHRView = JSON.parse( decodeURIComponent( XHRView.value ) );
                         // reset data-xhr
-                        //ginaToolbar.update("view-xhr", null);
                         ginaToolbar.update('view-xhr', XHRView);
-                        return;
                     }
 
-                    // popin content
-                    ginaToolbar.update('el-xhr', $popin.id);
-
                 } catch (err) {
                     throw err
                 }
             }
-        }
+
+            // XHRForm - updated by `open.`+ $popin.id event
+            // See: triggerEvent(gina, instance.target, 'open.'+ $popin.id, $popin);
+        } // EO function updateToolbar(result, resultIsObject)
 
 
 
@@ -20563,6 +20575,14 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid', 'lib/domain', 'lib/me
             } else {
                 triggerEvent(gina, instance.target, 'loaded.' + $popin.id, $popin);
             }
+            // Update toolbar
+            if ( gina && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
+                try {
+                    ginaToolbar.update("el-xhr", $popin.id);
+                } catch (err) {
+                    throw err
+                }
+            }
         }
 
         function getScript(source) {
@@ -20697,6 +20717,14 @@ define('gina/popin', [ 'require', 'jquery', 'vendor/uuid', 'lib/domain', 'lib/me
             // }
 
             triggerEvent(gina, instance.target, 'open.'+ $popin.id, $popin);
+            if ( gina && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
+                try {
+                    ginaToolbar.update("el-xhr", $popin.id);
+                } catch (err) {
+                    throw err
+                }
+            }
+
         }
 
         /**
@@ -21537,7 +21565,16 @@ for (var t = 0, len = tags.length; t < len; ++t) {
                         window['GINA_ENV']          = '{{ GINA_ENV }}';
                         window['GINA_ENV_IS_DEV']   = /^true$/i.test('{{ GINA_ENV_IS_DEV }}') ? true : false;
                         if ( typeof(location.search) != 'undefined' && /debug\=/i.test(window.location.search) ) {
-                            window['GINA_ENV_IS_DEV'] = gina['config']['envIsDev'] = options['envIsDev'] = /^true$/i.test(window.location.search.match(/debug=(true|false)/)[0].split(/\=/)[1]) ? true: false;
+                            var search = (' ' + window.location.search).slice(1);
+                            if (!search && /\?/.test(window.location.href) ) {
+                                search = window.location.href.match(/\?.*/);
+                                if (Array.isArray(search) && search.length > 0) {
+                                    search = search[0]
+                                }
+                            }
+                            var matched = search.match(/debug=(true|false)/);
+                            if (matched)
+                                window['GINA_ENV_IS_DEV'] = gina['config']['envIsDev'] = options['envIsDev'] = /^true$/i.test(matched[0].split(/\=/)[1]) ? true: false;
                         }
 
                         gina["setOptions"](options);