gina 0.1.6-alpha.89 → 0.1.6-alpha.90

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/core/plugins/index.js

@@ -16,8 +16,8 @@
 function Plugins() {
 
     var _require = function(path) {
-        var cacheless = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
-        if (cacheless) {
+        var isCacheless = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
+        if (isCacheless) {
             try {
                 delete require.cache[require.resolve(path)];
                 return require(path)

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

@@ -683,7 +683,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             //instance: self.serverInstance,
             //template: (routeHasViews) ? conf.content.templates[templateName] : undefined,
             //isUsingTemplate: local.isUsingTemplate,
-            cacheless: conf.cacheless //,
+            isCacheless: conf.isCacheless //,
             //path: params.param.path || null, // user custom path : namespace should be ignored | left blank
             //assets: {}
         };

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

@@ -1094,7 +1094,7 @@ function ValidatorPlugin(rules, data, formId) {
                                 var url = window.URL.createObjectURL(blob);
                                 a.href = url;
                                 var contentDisposition = xhr.getResponseHeader("Content-Disposition");
-                                a.download = contentDisposition.match('\=(.*)')[0].substr(1);
+                                a.download = contentDisposition.match('\=(.*)')[0].substring(1);
                                 //programatically click the link to trigger the download
                                 a.click();
 
@@ -1998,7 +1998,7 @@ function ValidatorPlugin(rules, data, formId) {
                         filesToBeRemoved.push(childNodeFilePreview);
                     }
                 } else {
-                    let file = childNodes[i].src.substr(childNodes[i].src.lastIndexOf('/')+1);
+                    let file = childNodes[i].src.substring(childNodes[i].src.lastIndexOf('/')+1);
                     childNodeFile = file;
                     filesToBeRemoved.push(childNodeFile);
                 }
@@ -2434,7 +2434,7 @@ function ValidatorPlugin(rules, data, formId) {
                     for (let m = 0, mLen = mergingRules.length; m < mLen; m++) {
                         if ( re.test(mergingRules[m]) ) {
                             let tmpStr = JSON.stringify(rule);
-                            tmpStr = tmpStr.substr(1, tmpStr.length-1);// removing ->{ ... }<-
+                            tmpStr = tmpStr.substring(1, tmpStr.length-1);// removing ->{ ... }<-
                             // is last ?
                             if (m < mLen-1) {
                                 tmpStr += ','
@@ -3525,14 +3525,14 @@ function ValidatorPlugin(rules, data, formId) {
                         case 46: //Delete
                         case 8: //Backspace
                             if (posStart != posEnd) {
-                                $_el.value = str.substr(0, posStart) + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart) + str.substring(posEnd);
                                 if (posStart == 0) {
-                                    $_el.value = str.substr(posEnd);
+                                    $_el.value = str.substring(posEnd);
                                 }
                             } else if (posStart == 0) {
                                 $_el.value = str.substring(posStart+1);
                             } else {
-                                $_el.value = str.substr(0, posStart-1) + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart-1) + str.substring(posEnd);
                             }
 
                             e.currentTarget.setAttribute('readonly', 'readonly');
@@ -3620,14 +3620,14 @@ function ValidatorPlugin(rules, data, formId) {
                         default:
                             // Replace selection
                             if (posStart != posEnd) {
-                                $_el.value = str.substr(0, posStart) + e.key;
+                                $_el.value = str.substring(0, posStart) + e.key;
                                 if (posEnd-1 < str.length) {
                                     $_el.value += str.substring(posEnd)
                                 }
                             } else if (posStart == 0) {
                                 $_el.value = e.key + str.substring(posStart);
                             } else {
-                                $_el.value = str.substr(0, posStart) + e.key + str.substr(posEnd);
+                                $_el.value = str.substring(0, posStart) + e.key + str.substring(posEnd);
                             }
                             e.currentTarget.setAttribute('readonly', 'readonly');
                             // Force restore last caret position
@@ -4375,7 +4375,7 @@ function ValidatorPlugin(rules, data, formId) {
                         } else if ( /img/i.test($els[i].tagName) ) {
                             $img = $els[i];
                             deleteLinkId = uploadTriggerId + '-'+index+'-delete-trigger';
-                            let file = $img.src.substr($img.src.lastIndexOf('/')+1);
+                            let file = $img.src.substring($img.src.lastIndexOf('/')+1);
                             $uploadTrigger.customFiles.push({
                                 name: file,
                                 deleteLinkId: deleteLinkId
@@ -7147,7 +7147,7 @@ function ValidatorPlugin(rules, data, formId) {
                     }
 
                     if (isGFFCtx)
-                        $fields[field].setAttribute('data-gina-form-errors', fieldErrorsAttributes[field].substr(0, fieldErrorsAttributes[field].length-1))
+                        $fields[field].setAttribute('data-gina-form-errors', fieldErrorsAttributes[field].substring(0, fieldErrorsAttributes[field].length-1))
                 }
 
                 //calling back

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/core/router.js

@@ -94,6 +94,13 @@ function Router(env, scope) {
         return self.serverInstance;
     }
 
+    /**
+     * Check if env is running cacheless
+     * */
+    this.isCacheless = function() {
+        return (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+    }
+
 
     /**
      * Route on the fly
@@ -125,7 +132,7 @@ function Router(env, scope) {
             , bundle            = null
             , env               = null
             , scope             = null
-            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+            , isCacheless       = self.isCacheless()
        ;
         try {
             config      = new Config().getInstance();
@@ -150,7 +157,7 @@ function Router(env, scope) {
             return;
         }
 
-        local.cacheless     = cacheless;
+        local.isCacheless   = isCacheless;
         local.request       = request;
         local.next          = next;
         local.conf          = conf;
@@ -355,7 +362,7 @@ function Router(env, scope) {
         */
 
 
-        if (cacheless) {
+        if (isCacheless) {
             refreshCoreDependencies();
         }
 
@@ -451,7 +458,7 @@ function Router(env, scope) {
             executionPath   : conf.executionPath || null,
             //instance: self.serverInstance,
             isUsingTemplate : local.isUsingTemplate,
-            cacheless       : cacheless,
+            isCacheless     : isCacheless,
             path            : params.param.path || null, // user custom path : namespace should be ignored or left blank
             assets          : {}
         };
@@ -459,6 +466,9 @@ function Router(env, scope) {
         if (routeHasViews) {
             options.template = (routeHasViews) ? conf.content.templates[templateName] || conf.content.templates._common : undefined;
             options.template.externalPlugins = [];
+            if ( /http\/2/.test(conf.server.protocol) ) {
+                options.template.h2Links = '';
+            }
         }
 
         // Options need to be protected by a clone to allow overrides
@@ -491,7 +501,7 @@ function Router(env, scope) {
             }
             setupFileObj = null;
 
-            if (cacheless) {
+            if (isCacheless) {
                 if (hasControllerNamespace) {
                     delete require.cache[require.resolve(_(mainControllerFile, true))];
                 }
@@ -539,7 +549,7 @@ function Router(env, scope) {
              * */
             var requireController = function (namespace, options) {
 
-                var cacheless   = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
+                var isCacheless = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
                 var corePath    = getPath('gina').core;
                 var config      = getContext('gina').Config.instance;
                 var bundle      = config.bundle;
@@ -559,7 +569,7 @@ function Router(env, scope) {
 
                 try {
 
-                    //if (cacheless) {
+                    //if (isCacheless) {
                         // Super controller
                         delete require.cache[require.resolve(_(corePath +'/controller/index.js', true))];
                         require.cache[_(corePath +'/controller/index.js', true)] = require( _(corePath +'/controller/index.js', true) );
@@ -748,7 +758,7 @@ function Router(env, scope) {
                 filename = sharedFilename;
             }
 
-            if (local.cacheless) delete require.cache[require.resolve(_(filename, true))];
+            if (local.isCacheless) delete require.cache[require.resolve(_(filename, true))];
 
             var MiddlewareClass = function(req, res, next) {
                 // getting rid of the middleware context
@@ -760,7 +770,7 @@ function Router(env, scope) {
                         sharedFilenameObj.existsSync()
                         && filename != sharedFilename
                     ) {
-                        if (local.cacheless) delete require.cache[require.resolve(_(sharedFilename, true))];
+                        if (local.isCacheless) delete require.cache[require.resolve(_(sharedFilename, true))];
                         // sharedFilename as SuperClass
                         Middleware = inherits(require(_(filename, true)), require(_(sharedFilename, true)));
                     }