Builder/Provider/File/Base.js

[app.Builder.js] / Builder / Provider / File / Base.js

diff --git a/Builder/Provider/File/Base.js b/Builder/Provider/File/Base.js
index c6144fb..a432637 100644 (file)
--- a/Builder/Provider/File/Base.js
+++ b/Builder/Provider/File/Base.js
@@ -11,11 +11,16 @@ File = imports.File.File;
 Base = XObject.define(
     
     function(cfg) {
-    
+        
         XObject.extend(this, cfg);
+        
     },
     Object,
     {
+        /**
+         * @cfg {Array} doubleStringProps list of properties that can be double quoted.
+         */
+        doubleStringProps : false,
         
         id : false,
         name : false,   // is the JS name of the file.
@@ -55,8 +60,8 @@ Base = XObject.define(
         {
             var ret = { }; 
             var _this = this;
-            ['id', 'name', 'parent', 'title', 'path', 'items', 'project'].forEach( function(k) {
-                ret[k] = _this[k];
+            ['id', 'name', 'parent', 'title', 'path', 'items' , 'permname' ].forEach( function(k) {
+                ret[k] = typeof(_this[k]) == 'undefined' ? '' : _this[k];
             });
             return ret;
         },
@@ -254,11 +259,11 @@ Base = XObject.define(
             var left =  '';
             
             keys.forEach(function(i) {
-                var el = obj[i];
-                if (typeof(obj) == 'undefined') { // empty or removed.
+              
+                if (typeof(obj[i]) == 'undefined') { // empty or removed.
                     return;
                 }
-                
+                var el = obj[i];
                 if (!isArray && skip.indexOf(i) > -1) { // things we do not write..
                     return;
                 }
@@ -269,7 +274,7 @@ Base = XObject.define(
                         left = "'" + leftv + "'";
                     } else if (leftv.match(/[^A-Z_]+/i)) { // not plain a-z... - quoted.
                         var val = JSON.stringify(leftv);
-                        left = "'" + val.substring(1, val.length-1).replace(/'/, "\\'") + "'";
+                        left = "'" + val.substring(1, val.length-1).replace(/'/g, "\\'") + "'";
                     } else {
                         left = '' + leftv;
                     }
@@ -329,8 +334,23 @@ Base = XObject.define(
                     return;
                 }
                 // standard. .
+                if (typeof(obj[i]) != 'string') {
+                    els.push(left + JSON.stringify(obj[i]));
+                    return;
+                }
+                // strings..
+                if (!_this.doubleStringProps) {
+                    els.push(left + JSON.stringify(obj[i]));
+                    return;
+                }
+                if (_this.doubleStringProps.indexOf(i) > -1) {
+                    els.push(left + JSON.stringify(obj[i]));
+                    return;
+                }
+                // single quote..
+                els.push(left + "'" + obj[i].replace(/'/g, "\\'") + "'");
                 
-                els.push(left + JSON.stringify(obj[i]));
+
             });
             
             if (!isArray && !els.length) {
@@ -349,6 +369,9 @@ Base = XObject.define(
          
         
     }
+    
+     
+    
 );