gina 0.1.6-alpha.157 → 0.1.6-alpha.158

package/framework/v0.1.6-alpha.158/VERSION

@@ -0,0 +1 @@
+0.1.6-alpha.158

package/framework/{v0.1.6-alpha.157 → v0.1.6-alpha.158}/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.157/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.158/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}

package/framework/{v0.1.6-alpha.157 → v0.1.6-alpha.158}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -5615,7 +5615,7 @@ function Routing() {
                 route.proxy_hostname  = window.location.protocol +'//'+ document.location.hostname;
             } else {
                 route.proxy_hostname  = process.gina.PROXY_HOSTNAME || config.envConf._proxyHostname;
-                console.debug("[getRoute#1]["+isProxyHost+"] process.gina.PROXY_HOSTNAME ("+ process.gina.PROXY_HOSTNAME  +") VS config.envConf._proxyHostname ("+ config.envConf._proxyHostname +")");
+                // console.debug("[getRoute#1]["+isProxyHost+"] process.gina.PROXY_HOSTNAME ("+ process.gina.PROXY_HOSTNAME  +") VS config.envConf._proxyHostname ("+ config.envConf._proxyHostname +")");
             }
             route.proxy_host      = route.proxy_hostname.replace(/^(https|http)\:\/\//, '');
 
@@ -7960,7 +7960,8 @@ function Collection(content, options) {
             true: {
                 re: '^%s$'
             }
-        }
+        },
+        skipEval: false
     };
     var withOrClause = false;
     var notInSearchModeEnabled = false;
@@ -8000,7 +8001,12 @@ function Collection(content, options) {
         if (!content[entry]) {
             content[entry] = {};
         }
-        content[entry]._uuid = uuid.v4();
+        if ( typeof(content[entry]._uuid) != 'undefined' ) {
+            content[entry]._hasItsOwnUuid = true;
+        } else {
+            content[entry]._uuid = uuid.v4();
+        }
+
         // To avoid duplicate entries
         searchIndex[idx] = content[entry]._uuid;
         ++idx;
@@ -8013,13 +8019,13 @@ function Collection(content, options) {
      * eg.:
      *  var recCollection = new Collection(arrayCollection);
      *  var rec =  recCollection
-     *                  .setSearchOption('name', 'isCaseSensitive', false)
+     *                  .setSearchOption('city', 'isCaseSensitive', false)
      *                  .find({ city: 'cap Town' });
      *
      * eg.:
      *  var recCollection = new Collection(arrayCollection);
      *  var searchOptions = {
-     *      name: {
+     *      city: {
      *          isCaseSensitive: false
      *      }
      *  };
@@ -8045,7 +8051,7 @@ function Collection(content, options) {
             , len   = arguments.length
         ;
 
-        if (arguments.length == 1) {
+        if (len == 1) {
             if ( typeof(arguments[0]) != 'object' )
                 throw new Error('searchOption must be an object');
 
@@ -8145,6 +8151,13 @@ function Collection(content, options) {
              * @param {number} matched
              */
             var search = function(filter, field, _content, matched, searchOptionRules) {
+                if (
+                    localSearchOptions
+                    && typeof(localSearchOptions[field]) != 'undefined'
+                ) {
+                    searchOptionRules = merge(localSearchOptions[field], searchOptionRules);
+                }
+
                 var reValidCount = null, searchOptCount = null;
                  // null case
                 if (filter === null && _content === null) {
@@ -8168,6 +8181,7 @@ function Collection(content, options) {
                     && typeof(_content) !== 'object'
                     && /(<|>|=)/.test(filter)
                     && !/undefined|function/.test(typeof(_content))
+                    && !searchOptionRules.skipEval
                 ) { // with operations
                     let originalFilter = filter;
                     let condition = _content + filter;
@@ -8205,6 +8219,12 @@ function Collection(content, options) {
                     && typeof(_content) !== 'object'
                     && _content === filter
                     && typeof(searchOptions[field]) == 'undefined'
+                    ||
+                    typeof(_content) != 'undefined'
+                    && typeof(_content) !== 'object'
+                    && _content === filter
+                    && typeof(searchOptions[field]) != 'undefined'
+                    && searchOptionRules.skipEval
                 ) {
 
                     ++matched;
@@ -8216,7 +8236,11 @@ function Collection(content, options) {
                 ) {
                     reValidCount    = 0;
                     searchOptCount  = searchOptions[field].count();
-                    for ( var rule in searchOptions[field]) {
+                    for ( let rule in searchOptions[field]) {
+                        if ( typeof(searchOptionRules[rule][searchOptions[field][rule]]) == 'undefined' ) {
+                            continue
+                        }
+
                         searchOptionRules[rule][searchOptions[field][rule]].re = searchOptionRules[rule][searchOptions[field][rule]].re.replace(/\%s/, filter);
 
                         if (searchOptionRules[rule][searchOptions[field][rule]].modifiers) {
@@ -8463,6 +8487,7 @@ function Collection(content, options) {
      *
      * Available options :
      *  isCaseSensitive: [true|false] - set to true by default
+     *  skipEval: [true|false] - set to false by default
      *
      * @param {object} filter
      *
@@ -8954,7 +8979,7 @@ function Collection(content, options) {
      *
      *  N.B.: will not affect current result - just returning the DIFF
      *  If you
-     * @param {object} filter - samme as `.find(filter)`
+     * @param {object} filter - same as `.find(filter)`
      * @param {string|boolean} [ uuid | disabled ] - by default, Collection is using its internal _uuid
      * If you want to delete without key comparison, disable `uuid` search mode
      * .delete({ name: 'Jordan' }, false)
@@ -9293,9 +9318,16 @@ function Collection(content, options) {
         var result = ( Array.isArray(this) ) ? this.slice() : content.slice();
         // cleanup
         for (var i = 0, len = result.length; i < len; ++i) {
-            if (result[i]._uuid)
+            if (result[i]._hasItsOwnUuid) {
+                let hasItsOwnUuid = (/^true$/i.test(result[i]._hasItsOwnUuid) ) ? true : false;
+                delete result[i]._hasItsOwnUuid;
+                if (hasItsOwnUuid) {
+                    continue;
+                }
+            }
+            if (result[i]._uuid) {
                 delete result[i]._uuid;
-
+            }
         }
 
         // return JSON.clone(result);