gina 0.1.1-alpha.169 → 0.1.1-alpha.170

package/framework/{v0.1.1-alpha.169/core/asset/plugin/dist → v0.1.1-alpha.170/core/asset/plugin/dist/vendor/gina/js}/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.169/core/asset/plugin/dist/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.170/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.169/core/asset/plugin/src/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.170/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","unescape","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.169 → v0.1.1-alpha.170}/core/controller/controller.js

@@ -19,13 +19,15 @@ var zlib            = require('zlib');
 // var tls = require('tls');
 // var crypto = require('crypto');
 
-var lib             = require('./../../lib') || require.cache[require.resolve('./../../lib')];
+var lib             = require('./../../lib') || require.cache[require.resolve('./../../lib')];
 var merge           = lib.merge;
 var inherits        = lib.inherits;
 var console         = lib.logger;
 var Collection      = lib.Collection;
 var routingLib      = lib.routing;
 var swig            = require('swig');
+// Swig 2
+// var swig            = require('./../deps/swig-client/swig-2.0.0.min.js');
 var SwigFilters     = lib.SwigFilters;
 var statusCodes     = requireJSON( _( getPath('gina').core + '/status.codes') );
 
@@ -387,8 +389,8 @@ function SuperController(options) {
             var swigOptions = {
                 autoescape  : ( typeof(local.options.autoescape) != 'undefined') ? local.options.autoescape : false,
                 // `memory` is no working yet ... advanced rendering setup required
-                //cache       : (local.options.cacheless) ? false : 'memory'
-                cache       : false
+                cache       : (local.options.cacheless) ? false : 'memory'
+                // cache       : 'memory'
             };
             if (dir) {
                 swigOptions.loader = swig.loaders.fs(dir);
@@ -727,17 +729,17 @@ function SuperController(options) {
                 // layout = fs.readFileSync(layoutPath).toString();
 
                 await Promise.all([
-                    readFile(layoutPath),
-                    readFile(path)
+                        readFile(layoutPath),
+                        readFile(path)
                     ])
                     .then(([_layout, _tpl]) => {
                         layout  = _layout.toString();
                         tpl     = _tpl.toString();
                     })
                     .catch(error => {
-                    console.error(error.message);
-                    return;
-                });
+                        console.error(error.message);
+                        return;
+                    });
 
 
                 // mappin conf
@@ -870,7 +872,7 @@ function SuperController(options) {
                     + '{%- set userDataInspector.view.scripts       = "ignored-by-toolbar"  -%}'
                     + '{%- set userDataInspector.view.stylesheets   = "ignored-by-toolbar"  -%}'
                     + '{%- set userDataInspector.view.assets        = '+ JSON.stringify(assets) +' -%}'
-                    + '{%- include "'+ getPath('gina').core +'/asset/plugin/dist/toolbar/toolbar.html" with { gina: ginaDataInspector, user: userDataInspector } -%}'// jshint ignore:line
+                    + '{%- include "'+ getPath('gina').core +'/asset/plugin/dist/vendor/gina/html/toolbar.html" with { gina: ginaDataInspector, user: userDataInspector } -%}'// jshint ignore:line
                     + '{# END Gina Toolbar #}'
                 ;
 

package/framework/{v0.1.1-alpha.169 → v0.1.1-alpha.170}/core/plugins/lib/validator/src/main.js

@@ -1185,11 +1185,13 @@
                                         if ( !$popin ) {
                                             throw new Error('Popin with name `'+ popinName+'` not found !');
                                         }
+                                        console.debug('Validator::Popin now redirecting [1-c]');
                                         $popin.load($popin.name, popinUrl, $popin.options);
                                     } else if ($popin) {
+                                        console.debug('Validator::Popin now redirecting [1-d]');
                                         $popin.load($popin.name, popinUrl, $popin.options);
                                     }
-                                    if ($popin) {
+                                    if ($popin && !$popin.isOpen) {
                                         return setTimeout( function onPopinredirect($popin){
                                             if (!$popin.isOpen) {
                                                 $popin.open();

package/framework/{v0.1.1-alpha.169 → v0.1.1-alpha.170}/core/template/conf/statics.json

@@ -5,6 +5,6 @@
   "sass": "{templatesPath}/sass",  // used for templating
   "handlers": "{handlersPath}",  // used for templating
   //"common": "{sharedPath}",
-  "css/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist",
-  "js/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist"
+  "css/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/css",
+  "js/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/js"
 }

package/framework/{v0.1.1-alpha.169 → v0.1.1-alpha.170}/core/template/conf/templates.json

@@ -10,7 +10,7 @@
     "handlers": "{templatesPath}/handlers",
     "routeNameAsFilenameEnabled": true,
     "ginaEnabled": true, // set to false, this will exclude gina assets from being loaded
-    "pluginLoader": "{src:{gina}/framework/v{version}/core/asset/plugin/dist/gina.onload.min.js}",
+    "pluginLoader": "{src:{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js}",
     "http-metas": {
       "content-type": "text/html"
     },

package/framework/{v0.1.1-alpha.169 → v0.1.1-alpha.170}/helpers/prototypes.js

@@ -100,7 +100,7 @@ function PrototypesHelper(instance) {
          * Changes made here must be reflected in:
          *  - gina/utils/prototypes.js
          *  - gina/framework/version/helpers/prototypes.js
-         *  - gina/framework/version/core/asset/plugin/src/gina/utils/polyfill.js
+         *  - gina/framework/version/core/asset/plugin/src/vendor/gina/js/utils/polyfill.js
          *
          * @param {object} jsonStr
          *