deploy1 6 years ago
parent
commit
630b447ffd
1 changed files with 12 additions and 14 deletions
  1. 12 14
      electra2020.js

+ 12 - 14
electra2020.js

@@ -57,7 +57,6 @@ function uberfactory(uuid, slugger) {
 
     return function factory(therootname) {
         var seed = therootname;
-        console.log("ROOT:", therootname);
 
         var ROOT = new electra(therootname, true, false)
 
@@ -566,7 +565,6 @@ function uberfactory(uuid, slugger) {
         }
         electra.prototype.innerExport = function(path, serializers) {
             var self = this;
-
             var obj = {};
             // obj._id = self._id;
             obj.name = self.name;
@@ -615,13 +613,13 @@ function uberfactory(uuid, slugger) {
                     delete obj[k];
                     //obj[k] = null /* nope */
                 }
-                674555
             })
+
             var therest = _.omit(self, ignores);
 
-            seriadeep(therest, obj, serializers);
+            //seriadeep(therest, obj, serializers,1);
 
-            /*_.map(therest, function(val, ke) {
+            _.map(therest, function(val, ke) {
                 if (typeof(val) === "function") {
                     obj[ke] = "$$$FUNCTION$$$" + val;
                 } else {
@@ -635,17 +633,18 @@ function uberfactory(uuid, slugger) {
                 }
             })
 
-*/
+
 
             return obj
         }
 
-        function seriadeep(rest, obj, serializers) {
+        function seriadeep(rest, obj, serializers,one) {
+            if(one>2){return }
             _.map(rest, function(val, ke) {
                 if (typeof(val) === "function") {
                     obj[ke] = "$$$FUNCTION$$$" + val;
                 } else if (typeof(val) === "object") {
-                    obj[ke] = seriadeep(val, obj, serializers);
+                    obj[ke] = seriadeep(val, obj, serializers, (one||1) +1);
                 } else {
                     if (serializers && serializers[ke]) {
                         obj[ke] = serializers[ke](val)
@@ -679,20 +678,19 @@ function uberfactory(uuid, slugger) {
             var self = this;
             async.mapLimit(this.children, 10, function(obj, next) {
                 obj().export(path + obj().name, next)
-                //	 		next(null,)
             }, function(err, collect) {
                 var obj = self.innerExport(path);
-                collect.sort(function(a, b) {
-                    return a.name > b.name ? 1 : a.name < b.name ? -1 : 0
-                })
+                if (collect.sort) {
+                    collect.sort(function(a, b) {
+                        return a.name > b.name ? 1 : a.name < b.name ? -1 : 0
+                    })
+                }
                 obj.children = collect;
                 cb(err, obj);
             })
             return this;
         }
 
-
-
         return inner
     }