gina 0.1.1-alpha.180 → 0.1.1-alpha.181

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

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

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/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.1-alpha.180/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.1-alpha.181/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -2151,6 +2151,7 @@ define("requireLib", function(){});
 function Merge() {
 
     var newTarget           = []
+        , originalValueshasBeenCached = false
         //, keyComparison     = 'id' // use for collections merging [{ id: 'val1' }, { id: 'val2' }, {id: 'val3' }, ...]
     ;
 
@@ -2163,7 +2164,33 @@ function Merge() {
      *
      * @returns {object} [result]
      * */
-    var browse = function (target, source) {
+    var browse = function (_target, _source) {
+
+        var target = _target, source = _source;
+
+        // clone target & source to prevent mutations from the originals
+        if (!originalValueshasBeenCached) {
+            if ( typeof(_target) == 'object' && Array.isArray(_target) ) {
+                // target = _target.slice();
+            } else if ( typeof(_target) == 'object' ) {
+                // try {
+                    // if ( typeof(_target['modelUtil']) != 'undefined' && typeof(_target['loggerInstance']) != 'undefined' ) {
+                    //     console.info('Pause ... this is something')
+                    // }
+                    // target = JSON.clone(_target);
+                // } catch(cloneErr) { // might be a complex object
+                //     console.warn('Merge ignoring complex object backup: '+ cloneErr.stack);
+                // }
+            }
+
+            // if ( typeof(_source) == 'object' && Array.isArray(_source) ) {
+            //     source = _source.slice();
+            // } else if ( typeof(_source) == 'object' && !Array.isArray(_source) ) {
+            //     source = JSON.clone(_source);
+            // }
+
+            originalValueshasBeenCached = true;
+        }
 
         if ( typeof(target) == 'undefined' ) {
             target = ( typeof(source) != 'undefined' && Array.isArray(source)) ? [] : {}
@@ -2335,6 +2362,7 @@ function Merge() {
         }
 
         newTarget = [];
+        originalValueshasBeenCached = false;
 
         return target;
     };
@@ -2355,6 +2383,7 @@ function Merge() {
             // if collection, comparison will be done uppon the `id` attribute by default unless you call .setKeyComparison('someField')
             if (
                 typeof(options[0]) == 'object'
+                && options[0] != null
                 && typeof(options[0][keyComparison]) != 'undefined'
                 && typeof(target[0]) == 'object'
                 && typeof(target[0][keyComparison]) != 'undefined'
@@ -2511,9 +2540,17 @@ function Merge() {
             } else { // normal case `arrays`
                 a = 0;
                 // in case there is no keyComparison in options[*].props
-                var localKeyComparison = null;
+                var localKeyComparison = null, ownPropertyNames = null;
                 for (; a < options.length; ++a ) {
-                    localKeyComparison = (typeof(options) != 'undefined' && typeof(options[a]) == 'object' && !Array.isArray(options[a]) ) ? Object.getOwnPropertyNames(options[a])[0] : null;
+                    ownPropertyNames = null;
+                    if (typeof(options) != 'undefined' && typeof(options[a]) == 'object' && !Array.isArray(options[a]) && options[a] != null ) {
+                        ownPropertyNames = Object.getOwnPropertyNames(options[a])
+                    }
+                    if ( typeof(ownPropertyNames) != 'undefined' && ownPropertyNames != null) {
+                        ownPropertyNames = ownPropertyNames[0] || null
+                    }
+                    // localKeyComparison = (typeof(options) != 'undefined' && typeof(options[a]) == 'object' && !Array.isArray(options[a]) ) ? ownPropertyNames : null;
+                    localKeyComparison = ownPropertyNames;
                     if ( target.indexOf(options[a]) > -1 && override) {
                         target.splice(target.indexOf(options[a]), 1, options[a])
                     } else if ( typeof(newTarget[a]) == 'undefined' && typeof(options[a]) == 'object' ) {
@@ -2642,10 +2679,12 @@ function Merge() {
         return keyComparison
     }
 
-    // clone target & source to prevent mutations from the originals
+    // // clone target & source to prevent mutations from the originals
     // if (!browse.originalValueshasBeenCached) {
     //     for (let a = 0, aLen = arguments.length; a < aLen; a++) {
-    //         if ( typeof(arguments[a]) == 'object' ) {
+    //         if ( typeof(arguments[a]) == 'object' && Array.isArray(arguments[a])) {
+    //             arguments[a] = arguments[a].slice();
+    //         } else if ( typeof(arguments[a]) == 'object' ) {
     //             arguments[a] = JSON.clone(arguments[a]);
     //         }
     //     }
@@ -5263,7 +5302,8 @@ function Collection(content, options) {
         if (foundResults.length > 0 ) {
             var arr = foundResults.toRaw();
             for (var a = 0, aLen = arr.length; a < aLen; ++a) {
-                arr[a] = merge( JSON.clone(set), arr[a]);
+                arr[a] = merge(JSON.clone(set), arr[a]);
+                // arr[a] = merge(set, arr[a]);
                 for (var r = 0, rLen = result.length; r < rLen; ++r) {
                     if ( typeof(result[r][key]) == 'undefined' && key == '_uuid' && typeof(result[r]['id']) != 'undefined' ) {
                         key = 'id';
@@ -5882,8 +5922,10 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
         throw new Error('missing data param')
     } else {
         // cloning
-        self  = merge( JSON.clone(data), self );
-        local.data = merge( JSON.clone(data), local.data);
+        self  = merge(JSON.clone(data), self );
+        // self  = merge(data, self );
+        local.data = merge(JSON.clone(data), local.data);
+        // local.data = merge(data, local.data);
     }
 
     var getElementByName = function($form, name) { // frontend only
@@ -9270,7 +9312,8 @@ function StoragePlugin(options) {
             var filter          = this['_filter'];
             this['_updatedAt']  = new Date().format("isoDateTime");
 
-            merge(tmpCollections[ collection ][ index ], this, true);
+            // merge(tmpCollections[ collection ][ index ], this, true);
+            tmpCollections[ collection ][ index ] = merge(tmpCollections[ collection ][ index ], this, true);
 
             // cleaning
             delete tmpCollections[ collection ][ index ]['_index'];
@@ -10482,10 +10525,10 @@ define("utils/dom", function(){});
 
     /**
      * send
-     * N.B.: no validation here; if you want to validate against rules, use `.submit()` before
+     * N.B.: no validation here; if you want to validate against rules, use `.submit()` or `.validateFormById(formId)` before
      *
      *
-     * @param {object} data
+     * @param {object} data - FormData object (https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects)
      * @param {object} [ options ] : { isSynchrone: true, withCredentials: true }
      * */
     var send = function(data, options) {
@@ -10994,7 +11037,7 @@ define("utils/dom", function(){});
                             if ( /^(\{|\[)/.test( xhr.responseText ) ) {
 
                                 try {
-                                    result = merge( JSON.parse(xhr.responseText), result )
+                                    result = merge(JSON.parse(xhr.responseText), result )
                                 } catch (err) {
                                     result = merge(err, result)
                                 }
@@ -11151,7 +11194,7 @@ define("utils/dom", function(){});
                             data = JSON.stringify(data)
                         } else {
                             var uploadGroup   = event.currentTarget.getAttribute('data-gina-form-upload-group') || 'untagged';
-                            for (var [key, value] of data.entries()) {
+                            for (var [key, value] of data.entries() ) {
                                 // file upload case
                                 if (value instanceof File) {
                                     if (!hasBinaries)
@@ -11168,7 +11211,6 @@ define("utils/dom", function(){});
                                 } else {
                                     newData[key] = value
                                 }
-
                             }
                         }
 
@@ -12091,6 +12133,7 @@ define("utils/dom", function(){});
                             customRule = customRule.replace(/\-|\//g, '.');
                             if ( typeof(rules) != 'undefined' ) {
                                 instance.$forms[id].rules[customRule] = instance.rules[customRule] = local.rules[customRule] = merge(JSON.clone( eval('gina.forms.rules.'+ customRule)), instance.rules[customRule]);
+                                // instance.$forms[id].rules[customRule] = instance.rules[customRule] = local.rules[customRule] = merge(eval('gina.forms.rules.'+ customRule), instance.rules[customRule]);
                             }
                             if ( typeof(local.rules[customRule]) == 'undefined' ) {
                                 throw new Error('['+id+'] no rule found with key: `'+customRule+'`. Please check if json is not malformed @ /forms/rules/' + customRule.replace(/\./g, '/') +'.json');