Revert "File.js"

This reverts commit f927f87326fa8196765f0c524cb514a2152f66c3.

diff --git a/Builder/Window.js b/Builder/Window.js
index fad8d44..ee270cf 100644 (file)
--- a/Builder/Window.js
+++ b/Builder/Window.js
@@ -264,7 +264,7 @@ Window=new XObject({
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        

-                                                        var     jsstr = JSON.(js[0], null, 4);
+                                                        var     jsstr = JSON.stringify(js[0], null, 4);

                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +
                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +


@@ -1141,7 +1141,7 @@ Window=new XObject({
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");

-                                                                                        print(JSON.(f.items, null,4));
+                                                                                        print(JSON.stringify(f.items, null,4));

                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();
                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();


@@ -1320,7 +1320,7 @@ Window=new XObject({
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }

-                                                                                return JSON.(o);
+                                                                                return JSON.stringify(o);

                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {
                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {


@@ -1371,7 +1371,7 @@ Window=new XObject({
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!

-                                                                                    return JSON.parse(JSON.(ar));
+                                                                                    return JSON.parse(JSON.stringify(ar));

                                                                                 }
                                                                                 
                                                                                 return ar;
                                                                                 }
                                                                                 
                                                                                 return ar;


@@ -1422,8 +1422,8 @@ Window=new XObject({
                                                                                      var el = tree.getActivePath();
                                                                                      print(el);
                                                                                      var js = model.toJS(el, false);
                                                                                      var el = tree.getActivePath();
                                                                                      print(el);
                                                                                      var js = model.toJS(el, false);

-                                                                                    // print(JSON.(js[0], null,4));
-                                                                                     this.get('/DialogSaveTemplate').show(JSON.(js[0], null,4));
+                                                                                    // print(JSON.stringify(js[0], null,4));
+                                                                                     this.get('/DialogSaveTemplate').show(JSON.stringify(js[0], null,4));

                                                                                      
                                                                                     
                                                                                 }
                                                                                      
                                                                                     
                                                                                 }


@@ -2382,7 +2382,7 @@ Window=new XObject({
                                                                         }
                                                                         
                                                                         
                                                                         }
                                                                         
                                                                         

-                                                                        //print(JSON.(ar));
+                                                                        //print(JSON.stringify(ar));

                                                                         return ar;
                                                                         // convert the l
                                                                     },
                                                                         return ar;
                                                                         // convert the l
                                                                     },


@@ -3121,14 +3121,14 @@ Window=new XObject({
                                                                                         
                                                                                         
                                                                                         this.renderedData = data;
                                                                                         
                                                                                         
                                                                                         this.renderedData = data;

-                                                                                        var str = JSON.(data) ;
+                                                                                        var str = JSON.stringify(data) ;

                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         }
                                                                                         this.lastRedraw = new Date();
                                                                                     
                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         }
                                                                                         this.lastRedraw = new Date();
                                                                                     

-                                                                                        this.el.execute_script("Builder.render(" + JSON.(data) + ");");
+                                                                                        this.el.execute_script("Builder.render(" + JSON.stringify(data) + ");");

                                                                                          print( "before render" +    this.lastRedraw);
                                                                                         print( "after render" +    (new Date()));
                                                                                         
                                                                                          print( "before render" +    this.lastRedraw);
                                                                                         print( "after render" +    (new Date()));
                                                                                         

diff --git a/Builder3/Main.js b/Builder3/Main.js
index 8e5cbcf..c098538 100644 (file)
--- a/Builder3/Main.js
+++ b/Builder3/Main.js
@@ -3,9 +3,9 @@ Gdk = imports.gi.Gdk;
 
 Window = imports.Builder3.Window.Window;
 
 
 Window = imports.Builder3.Window.Window;
 

-JSON.x = function (o) {
+JSON.xstringify = function (o) {

          var seen = [];
          var seen = [];

-         return JSON.(o, function(_, value) {
+         return JSON.stringify(o, function(_, value) {

                  if (typeof value === 'object' && value !== null) {
                          if (seen.indexOf(value) !== -1) return null;
                          else seen.push(value);
                  if (typeof value === 'object' && value !== null) {
                          if (seen.indexOf(value) !== -1) return null;
                          else seen.push(value);

diff --git a/Builder3/Window.js b/Builder3/Window.js
index a3bd736..c72c8cf 100644 (file)
--- a/Builder3/Window.js
+++ b/Builder3/Window.js
@@ -251,7 +251,7 @@ Window=new XObject({
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        

-                                                        var     jsstr = JSON.(js[0], null, 4);
+                                                        var     jsstr = JSON.stringify(js[0], null, 4);

                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +
                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +


@@ -382,7 +382,7 @@ Window=new XObject({
                                                        
                                                         var model = this.get('/LeftProjectTree.combomodel');
                                                         //  print ("loading Projects?")
                                                        
                                                         var model = this.get('/LeftProjectTree.combomodel');
                                                         //  print ("loading Projects?")

-                                                                                                               //print(JSON.(pm.projects, null,4));Seed.quit();
+                                                                                                               //print(JSON.stringify(pm.projects, null,4));Seed.quit();

                                                         //console.dump(pm.projects);
                                                         model.loadData(pm.projects);
                                                          
                                                         //console.dump(pm.projects);
                                                         model.loadData(pm.projects);
                                                          


@@ -607,7 +607,7 @@ Window=new XObject({
                                                                                 Gdk.drag_status(ctx, 0, time);
                                                                                 return true;
                                                                             }
                                                                                 Gdk.drag_status(ctx, 0, time);
                                                                                 return true;
                                                                             }

-                                                                            //  print(JSON.(tg,null,4));
+                                                                            //  print(JSON.stringify(tg,null,4));

                                                                             //console.dump(tg);
                                                                             this.targetData = tg;    
                                                                             
                                                                             //console.dump(tg);
                                                                             this.targetData = tg;    
                                                                             


@@ -618,7 +618,7 @@ Window=new XObject({
                                                                         },
                                                                         drag_drop : function (w, ctx, x, y, time) {
                                                                               Seed.print("TARGET: drag-drop");
                                                                         },
                                                                         drag_drop : function (w, ctx, x, y, time) {
                                                                               Seed.print("TARGET: drag-drop");

-                                                                                //print(JSON.(w.drag_dest_get_target_list(),null,4));
+                                                                                //print(JSON.stringify(w.drag_dest_get_target_list(),null,4));

                                                                                 w.drag_get_data
                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                         ctx,        /* represents the current state of the DnD */
                                                                                 w.drag_get_data
                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                         ctx,        /* represents the current state of the DnD */


@@ -637,7 +637,7 @@ Window=new XObject({
                                                                         
                                                                                       var   delete_selection_data = false;
                                                                                        var  dnd_success = false;
                                                                         
                                                                                       var   delete_selection_data = false;
                                                                                        var  dnd_success = false;

-                                                                                       //print(JSON.(sel_data, null,4));
+                                                                                       //print(JSON.stringify(sel_data, null,4));

                                                                                         /* Deal with what we are given from source */
                                                                                         
                                                                                         // simce I can not be bothered to sort out
                                                                                         /* Deal with what we are given from source */
                                                                                         
                                                                                         // simce I can not be bothered to sort out


@@ -1142,7 +1142,7 @@ Window=new XObject({
                                                                                             } else {
                                                                                                 this.el.append(ret);
                                                                                             }
                                                                                             } else {
                                                                                                 this.el.append(ret);
                                                                                             }

-                                                                                            //print(JSON.(ret,null,4));
+                                                                                            //print(JSON.stringify(ret,null,4));

                                                                                             //print('call nodeToJSON: ' + tr[i]);
                                                                                             var body = this.nodeToJSON(tr[i]);
                                                                                             //print(body);
                                                                                             //print('call nodeToJSON: ' + tr[i]);
                                                                                             var body = this.nodeToJSON(tr[i]);
                                                                                             //print(body);


@@ -1186,7 +1186,7 @@ Window=new XObject({
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");

-                                                                                        //print(JSON.(f.items, null,4));
+                                                                                        //print(JSON.stringify(f.items, null,4));

                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();
                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();


@@ -1244,7 +1244,7 @@ Window=new XObject({
                                                                                 s.get_selected( oret);
                                                                                 var node = this.nodeToJS(oret.iter,false);
                                                                                     //console.dump(node);
                                                                                 s.get_selected( oret);
                                                                                 var node = this.nodeToJS(oret.iter,false);
                                                                                     //console.dump(node);

-                                                                                //print(JSON.(node, null,4)); 
+                                                                                //print(JSON.stringify(node, null,4)); 

                                                                                     
                                                                                     // needs to drop first, otherwise the target_data 
                                                                                         // treepath will be invalid.
                                                                                     
                                                                                     // needs to drop first, otherwise the target_data 
                                                                                         // treepath will be invalid.


@@ -1370,7 +1370,7 @@ Window=new XObject({
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }

-                                                                                return JSON.(o);
+                                                                                return JSON.stringify(o);

                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {
                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {


@@ -1426,7 +1426,7 @@ Window=new XObject({
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!

-                                                                                    return JSON.parse(JSON.(ar));
+                                                                                    return JSON.parse(JSON.stringify(ar));

                                                                                 }
                                                                                 
                                                                                 return ar;
                                                                                 }
                                                                                 
                                                                                 return ar;


@@ -1477,8 +1477,8 @@ Window=new XObject({
                                                                                     var el = tree.getActivePath();
                                                                                     print(el);
                                                                                     var js = model.toJS(el, false);
                                                                                     var el = tree.getActivePath();
                                                                                     print(el);
                                                                                     var js = model.toJS(el, false);

-                                                                                    // print(JSON.(js[0], null,4));
-                                                                                    this.get('/DialogSaveTemplate').show(JSON.(js[0], null,4));
+                                                                                    // print(JSON.stringify(js[0], null,4));
+                                                                                    this.get('/DialogSaveTemplate').show(JSON.stringify(js[0], null,4));

                                                                                      
                                                                                     
                                                                                 }
                                                                                      
                                                                                     
                                                                                 }


@@ -1578,9 +1578,9 @@ Window=new XObject({
                                                                                                                                                                                data.forEach(function(p) {
                                                                                             
                                                                                             el.append(na);
                                                                                                                                                                                data.forEach(function(p) {
                                                                                             
                                                                                             el.append(na);

-                                                                                            //print(JSON.(XObject.keys(na)));
+                                                                                            //print(JSON.stringify(XObject.keys(na)));

                                                                                             //print(typeof(na.iter));
                                                                                             //print(typeof(na.iter));

-                                                                                            //print(JSON.(iter))
+                                                                                            //print(JSON.stringify(iter))

                                                                                             el.set_value(na.iter, 0, p.fn);
                                                                                             el.set_value(na.iter, 1, p.name);
                                                                                             
                                                                                             el.set_value(na.iter, 0, p.fn);
                                                                                             el.set_value(na.iter, 1, p.name);
                                                                                             


@@ -1626,7 +1626,7 @@ Window=new XObject({
                                                                                     var s = this.selection;
                                                                                     s.get_selected(ret);
                                                                                     var value = ''+ ret.model.get_value(ret.iter, 2).value.get_string();
                                                                                     var s = this.selection;
                                                                                     s.get_selected(ret);
                                                                                     var value = ''+ ret.model.get_value(ret.iter, 2).value.get_string();

-                                                                                    //console.log(JSON.(value,null,4));// id..
+                                                                                    //console.log(JSON.stringify(value,null,4));// id..

                                                                                     console.log("OUT?" + value);// id..
                                                                                     var file = this.get('/LeftProjectTree').project.getById(value);
                                                                                     
                                                                                     console.log("OUT?" + value);// id..
                                                                                     var file = this.get('/LeftProjectTree').project.getById(value);
                                                                                     


@@ -2185,7 +2185,7 @@ Window=new XObject({
                                                                     
                                                                         this.el.set_value(ret.iter, 5, type + ' : ' + str);
                                                                         // update the tree...  
                                                                     
                                                                         this.el.set_value(ret.iter, 5, type + ' : ' + str);
                                                                         // update the tree...  

-                                                                        //print("new data: "  + JSON.(this.toJS() , null,4));
+                                                                        //print("new data: "  + JSON.stringify(this.toJS() , null,4));

                                                                         this.get('/LeftTree.model').setFromNode(false,this.toJS());
                                                                         this.get('/LeftTree.model').changed(doRefresh); 
                                                                                  
                                                                         this.get('/LeftTree.model').setFromNode(false,this.toJS());
                                                                         this.get('/LeftTree.model').changed(doRefresh); 
                                                                                  


@@ -2471,7 +2471,7 @@ Window=new XObject({
                                                                         }
                                                                         
                                                                         
                                                                         }
                                                                         
                                                                         

-                                                                        //print(JSON.(ar));
+                                                                        //print(JSON.stringify(ar));

                                                                         return ar;
                                                                         // convert the l
                                                                     },
                                                                         return ar;
                                                                         // convert the l
                                                                     },


@@ -2502,7 +2502,7 @@ Window=new XObject({
                                                                                 },
                                                                                 edited : function (self, object, p0) {
                                                                                     
                                                                                 },
                                                                                 edited : function (self, object, p0) {
                                                                                     

-                                                                                    //print("CHANGED VALUE:" + JSON.(p0, null,4));
+                                                                                    //print("CHANGED VALUE:" + JSON.stringify(p0, null,4));

                                                                                     //    return;
                                                                                        var model = this.get('/LeftPanel.model');
                                                                                     var path = model.activePath;
                                                                                     //    return;
                                                                                        var model = this.get('/LeftPanel.model');
                                                                                     var path = model.activePath;


@@ -3311,7 +3311,7 @@ Window=new XObject({
                                                                                         
                                                                                                                                                                                // not used.
                                                                                         //this.renderedData = data;
                                                                                         
                                                                                                                                                                                // not used.
                                                                                         //this.renderedData = data;

-                                                                                        //var str = JSON.(data) ;
+                                                                                        //var str = JSON.stringify(data) ;

                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');


@@ -3319,9 +3319,9 @@ Window=new XObject({
                                                                                         this.lastRedraw = new Date();
                                                                                         
                                                                                         this.el.execute_script("Builder.render(" +
                                                                                         this.lastRedraw = new Date();
                                                                                         
                                                                                         this.el.execute_script("Builder.render(" +

-                                                                                                                                                                                                               JSON.(js_src) +
+                                                                                                                                                                                                               JSON.stringify(js_src) +

                                                                                                                                                                                                                "," +
                                                                                                                                                                                                                "," +

-                                                                                                                                                                                                               JSON.(file.name) + 
+                                                                                                                                                                                                               JSON.stringify(file.name) + 

                                                                                                                                                                                                                ");");
                                                                                                                                                                                
                                                                                         print( "before render" +    this.lastRedraw);
                                                                                                                                                                                                                ");");
                                                                                                                                                                                
                                                                                         print( "before render" +    this.lastRedraw);


@@ -4022,7 +4022,7 @@ Window=new XObject({
                                         this.get('buttonbar').el.hide();
                                         this.get('viewbox').el.show();
                                         var ce = this.get('/Window.centereast').el;
                                         this.get('buttonbar').el.hide();
                                         this.get('viewbox').el.show();
                                         var ce = this.get('/Window.centereast').el;

-                                        //print(JSON.(XObject.keys(ce) ,null,4));
+                                        //print(JSON.stringify(XObject.keys(ce) ,null,4));

                                         ce.set_position(ce.get_allocated_width() - 150);
                                            
                                        // this.get('model').expanded();
                                         ce.set_position(ce.get_allocated_width() - 150);
                                            
                                        // this.get('model').expanded();

diff --git a/Builder4/Main.js b/Builder4/Main.js
index 3738afa..c098538 100644 (file)
--- a/Builder4/Main.js
+++ b/Builder4/Main.js
@@ -1,11 +1,11 @@
 Gtk = imports.gi.Gtk;
 Gdk = imports.gi.Gdk;
 
 Gtk = imports.gi.Gtk;
 Gdk = imports.gi.Gdk;
 

-Window = imports.Builder4.Window.Window;
+Window = imports.Builder3.Window.Window;

 
 

-JSON.x = function (o) {
+JSON.xstringify = function (o) {

          var seen = [];
          var seen = [];

-         return JSON.(o, function(_, value) {
+         return JSON.stringify(o, function(_, value) {

                  if (typeof value === 'object' && value !== null) {
                          if (seen.indexOf(value) !== -1) return null;
                          else seen.push(value);
                  if (typeof value === 'object' && value !== null) {
                          if (seen.indexOf(value) !== -1) return null;
                          else seen.push(value);

diff --git a/Builder4/Window.js b/Builder4/Window.js
index c8524a7..c98471f 100644 (file)
--- a/Builder4/Window.js
+++ b/Builder4/Window.js
@@ -251,7 +251,7 @@ Window=new XObject({
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        

-                                                        var     jsstr = JSON.(js[0], null, 4);
+                                                        var     jsstr = JSON.stringify(js[0], null, 4);

                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +
                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +


@@ -382,7 +382,7 @@ Window=new XObject({
                                                        
                                                         var model = this.get('/LeftProjectTree.combomodel');
                                                         //  print ("loading Projects?")
                                                        
                                                         var model = this.get('/LeftProjectTree.combomodel');
                                                         //  print ("loading Projects?")

-                                                                                                               //print(JSON.(pm.projects, null,4));Seed.quit();
+                                                                                                               //print(JSON.stringify(pm.projects, null,4));Seed.quit();

                                                         //console.dump(pm.projects);
                                                         model.loadData(pm.projects);
                                                          
                                                         //console.dump(pm.projects);
                                                         model.loadData(pm.projects);
                                                          


@@ -607,7 +607,7 @@ Window=new XObject({
                                                                                 Gdk.drag_status(ctx, 0, time);
                                                                                 return true;
                                                                             }
                                                                                 Gdk.drag_status(ctx, 0, time);
                                                                                 return true;
                                                                             }

-                                                                              print(JSON.(tg,null,4));
+                                                                              print(JSON.stringify(tg,null,4));

                                                                             //console.dump(tg);
                                                                             this.targetData = tg;    
                                                                             
                                                                             //console.dump(tg);
                                                                             this.targetData = tg;    
                                                                             


@@ -618,11 +618,11 @@ Window=new XObject({
                                                                         },
                                                                         drag_drop : function (w, ctx, x, y, time) {
                                                                               Seed.print("TARGET: drag-drop");
                                                                         },
                                                                         drag_drop : function (w, ctx, x, y, time) {
                                                                               Seed.print("TARGET: drag-drop");

-                                                                                //print(JSON.(w.drag_dest_get_target_list(),null,4));
+                                                                                //print(JSON.stringify(w.drag_dest_get_target_list(),null,4));

                                                                                 w.drag_get_data
                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                         ctx,        /* represents the current state of the DnD */
                                                                                 w.drag_get_data
                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                         ctx,        /* represents the current state of the DnD */

-                                                                                        imports.Builder4.Globals.atoms["STRING"],    /* the target type we want */
+                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */

                                                                                         time            /* time stamp */
                                                                                 );
                                                                                 
                                                                                         time            /* time stamp */
                                                                                 );
                                                                                 


@@ -637,7 +637,7 @@ Window=new XObject({
                                                                         
                                                                                       var   delete_selection_data = false;
                                                                                        var  dnd_success = false;
                                                                         
                                                                                       var   delete_selection_data = false;
                                                                                        var  dnd_success = false;

-                                                                                       //print(JSON.(sel_data, null,4));
+                                                                                       //print(JSON.stringify(sel_data, null,4));

                                                                                         /* Deal with what we are given from source */
                                                                                         
                                                                                         // simce I can not be bothered to sort out
                                                                                         /* Deal with what we are given from source */
                                                                                         
                                                                                         // simce I can not be bothered to sort out


@@ -789,7 +789,7 @@ Window=new XObject({
                                                                                Gdk.DragAction.COPY   | Gdk.DragAction.MOVE           /* what to do with data after dropped */
                                                                        );
                                                                      
                                                                                Gdk.DragAction.COPY   | Gdk.DragAction.MOVE           /* what to do with data after dropped */
                                                                        );
                                                                      

-                                                                       this.el.drag_source_set_target_list(imports.Builder4.Globals.targetList);
+                                                                       this.el.drag_source_set_target_list(imports.Builder3.Globals.targetList);

                                                                     
                                                                        this.el.drag_source_add_text_targets(); 
                                                                        this.el.drag_dest_set
                                                                     
                                                                        this.el.drag_source_add_text_targets(); 
                                                                        this.el.drag_dest_set


@@ -800,7 +800,7 @@ Window=new XObject({
                                                                            Gdk.DragAction.COPY   | Gdk.DragAction.MOVE       /* what to do with data after dropped */
                                                                        );
                                                                     
                                                                            Gdk.DragAction.COPY   | Gdk.DragAction.MOVE       /* what to do with data after dropped */
                                                                        );
                                                                     

-                                                                       this.el.drag_dest_set_target_list(  imports.Builder4.Globals.targetList);
+                                                                       this.el.drag_dest_set_target_list(  imports.Builder3.Globals.targetList);

                                                                        this.el.drag_dest_add_text_targets( );
                                                                     },
                                                                     selectNode : function(treepath_str) {
                                                                        this.el.drag_dest_add_text_targets( );
                                                                     },
                                                                     selectNode : function(treepath_str) {


@@ -1142,7 +1142,7 @@ Window=new XObject({
                                                                                             } else {
                                                                                                 this.el.append(ret);
                                                                                             }
                                                                                             } else {
                                                                                                 this.el.append(ret);
                                                                                             }

-                                                                                            //print(JSON.(ret,null,4));
+                                                                                            //print(JSON.stringify(ret,null,4));

                                                                                             //print('call nodeToJSON: ' + tr[i]);
                                                                                             var body = this.nodeToJSON(tr[i]);
                                                                                             //print(body);
                                                                                             //print('call nodeToJSON: ' + tr[i]);
                                                                                             var body = this.nodeToJSON(tr[i]);
                                                                                             //print(body);


@@ -1186,7 +1186,7 @@ Window=new XObject({
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");

-                                                                                        //print(JSON.(f.items, null,4));
+                                                                                        //print(JSON.stringify(f.items, null,4));

                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();
                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();


@@ -1244,7 +1244,7 @@ Window=new XObject({
                                                                                 s.get_selected( oret);
                                                                                 var node = this.nodeToJS(oret.iter,false);
                                                                                     //console.dump(node);
                                                                                 s.get_selected( oret);
                                                                                 var node = this.nodeToJS(oret.iter,false);
                                                                                     //console.dump(node);

-                                                                                print(JSON.(node, null,4)); 
+                                                                                print(JSON.stringify(node, null,4)); 

                                                                                     
                                                                                     // needs to drop first, otherwise the target_data 
                                                                                         // treepath will be invalid.
                                                                                     
                                                                                     // needs to drop first, otherwise the target_data 
                                                                                         // treepath will be invalid.


@@ -1370,7 +1370,7 @@ Window=new XObject({
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }

-                                                                                return JSON.(o);
+                                                                                return JSON.stringify(o);

                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {
                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {


@@ -1426,7 +1426,7 @@ Window=new XObject({
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!

-                                                                                    return JSON.parse(JSON.(ar));
+                                                                                    return JSON.parse(JSON.stringify(ar));

                                                                                 }
                                                                                 
                                                                                 return ar;
                                                                                 }
                                                                                 
                                                                                 return ar;


@@ -1477,8 +1477,8 @@ Window=new XObject({
                                                                                     var el = tree.getActivePath();
                                                                                     print(el);
                                                                                     var js = model.toJS(el, false);
                                                                                     var el = tree.getActivePath();
                                                                                     print(el);
                                                                                     var js = model.toJS(el, false);

-                                                                                    // print(JSON.(js[0], null,4));
-                                                                                    this.get('/DialogSaveTemplate').show(JSON.(js[0], null,4));
+                                                                                    // print(JSON.stringify(js[0], null,4));
+                                                                                    this.get('/DialogSaveTemplate').show(JSON.stringify(js[0], null,4));

                                                                                      
                                                                                     
                                                                                 }
                                                                                      
                                                                                     
                                                                                 }


@@ -1578,9 +1578,9 @@ Window=new XObject({
                                                                                                                                                                                data.forEach(function(p) {
                                                                                             
                                                                                             el.append(na);
                                                                                                                                                                                data.forEach(function(p) {
                                                                                             
                                                                                             el.append(na);

-                                                                                            //print(JSON.(XObject.keys(na)));
+                                                                                            //print(JSON.stringify(XObject.keys(na)));

                                                                                             //print(typeof(na.iter));
                                                                                             //print(typeof(na.iter));

-                                                                                            //print(JSON.(iter))
+                                                                                            //print(JSON.stringify(iter))

                                                                                             el.set_value(na.iter, 0, p.fn);
                                                                                             el.set_value(na.iter, 1, p.name);
                                                                                             
                                                                                             el.set_value(na.iter, 0, p.fn);
                                                                                             el.set_value(na.iter, 1, p.name);
                                                                                             


@@ -1626,7 +1626,7 @@ Window=new XObject({
                                                                                     var s = this.selection;
                                                                                     s.get_selected(ret);
                                                                                     var value = ''+ ret.model.get_value(ret.iter, 2).value.get_string();
                                                                                     var s = this.selection;
                                                                                     s.get_selected(ret);
                                                                                     var value = ''+ ret.model.get_value(ret.iter, 2).value.get_string();

-                                                                                    //console.log(JSON.(value,null,4));// id..
+                                                                                    //console.log(JSON.stringify(value,null,4));// id..

                                                                                     console.log("OUT?" + value);// id..
                                                                                     var file = this.get('/LeftProjectTree').project.getById(value);
                                                                                     
                                                                                     console.log("OUT?" + value);// id..
                                                                                     var file = this.get('/LeftProjectTree').project.getById(value);
                                                                                     


@@ -2185,7 +2185,7 @@ Window=new XObject({
                                                                     
                                                                         this.el.set_value(ret.iter, 5, type + ' : ' + str);
                                                                         // update the tree...  
                                                                     
                                                                         this.el.set_value(ret.iter, 5, type + ' : ' + str);
                                                                         // update the tree...  

-                                                                        print("new data: "  + JSON.(this.toJS() , null,4));
+                                                                        print("new data: "  + JSON.stringify(this.toJS() , null,4));

                                                                         this.get('/LeftTree.model').setFromNode(false,this.toJS());
                                                                         this.get('/LeftTree.model').changed(doRefresh); 
                                                                                  
                                                                         this.get('/LeftTree.model').setFromNode(false,this.toJS());
                                                                         this.get('/LeftTree.model').changed(doRefresh); 
                                                                                  


@@ -2471,7 +2471,7 @@ Window=new XObject({
                                                                         }
                                                                         
                                                                         
                                                                         }
                                                                         
                                                                         

-                                                                        //print(JSON.(ar));
+                                                                        //print(JSON.stringify(ar));

                                                                         return ar;
                                                                         // convert the l
                                                                     },
                                                                         return ar;
                                                                         // convert the l
                                                                     },


@@ -2502,7 +2502,7 @@ Window=new XObject({
                                                                                 },
                                                                                 edited : function (self, object, p0) {
                                                                                     
                                                                                 },
                                                                                 edited : function (self, object, p0) {
                                                                                     

-                                                                                    //print("CHANGED VALUE:" + JSON.(p0, null,4));
+                                                                                    //print("CHANGED VALUE:" + JSON.stringify(p0, null,4));

                                                                                     //    return;
                                                                                        var model = this.get('/LeftPanel.model');
                                                                                     var path = model.activePath;
                                                                                     //    return;
                                                                                        var model = this.get('/LeftPanel.model');
                                                                                     var path = model.activePath;


@@ -3076,7 +3076,7 @@ Window=new XObject({
                                                                                                 w.drag_get_data
                                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                                         ctx,        /* represents the current state of the DnD */
                                                                                                 w.drag_get_data
                                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                                         ctx,        /* represents the current state of the DnD */

-                                                                                                        imports.Builder4.Globals.atoms["STRING"],    /* the target type we want */
+                                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */

                                                                                                         time            /* time stamp */
                                                                                                 );
                                                                                                                 
                                                                                                         time            /* time stamp */
                                                                                                 );
                                                                                                                 


@@ -3170,7 +3170,7 @@ Window=new XObject({
                                                                                         );
                                                                                                                 
                                                                                        // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);
                                                                                         );
                                                                                                                 
                                                                                        // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);

-                                                                                        this.el.drag_dest_set_target_list(  imports.Builder4.Globals.targetList);
+                                                                                        this.el.drag_dest_set_target_list(  imports.Builder3.Globals.targetList);

                                                                                         
                                                                                         GLib.timeout_add_seconds(0, 1, function() {
                                                                                             //    print("run refresh?");
                                                                                         
                                                                                         GLib.timeout_add_seconds(0, 1, function() {
                                                                                             //    print("run refresh?");


@@ -3311,7 +3311,7 @@ Window=new XObject({
                                                                                         
                                                                                                                                                                                // not used.
                                                                                         //this.renderedData = data;
                                                                                         
                                                                                                                                                                                // not used.
                                                                                         //this.renderedData = data;

-                                                                                        //var str = JSON.(data) ;
+                                                                                        //var str = JSON.stringify(data) ;

                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');


@@ -3319,9 +3319,9 @@ Window=new XObject({
                                                                                         this.lastRedraw = new Date();
                                                                                         
                                                                                         this.el.execute_script("Builder.render(" +
                                                                                         this.lastRedraw = new Date();
                                                                                         
                                                                                         this.el.execute_script("Builder.render(" +

-                                                                                                                                                                                                               JSON.(js_src) +
+                                                                                                                                                                                                               JSON.stringify(js_src) +

                                                                                                                                                                                                                "," +
                                                                                                                                                                                                                "," +

-                                                                                                                                                                                                               JSON.(file.name) + 
+                                                                                                                                                                                                               JSON.stringify(file.name) + 

                                                                                                                                                                                                                ");");
                                                                                                                                                                                
                                                                                         print( "before render" +    this.lastRedraw);
                                                                                                                                                                                                                ");");
                                                                                                                                                                                
                                                                                         print( "before render" +    this.lastRedraw);


@@ -3792,7 +3792,7 @@ Window=new XObject({
                                                                                                                 );
                                                                                                                 
                                                                                                                // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);
                                                                                                                 );
                                                                                                                 
                                                                                                                // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);

-                                                                                                                this.el.drag_dest_set_target_list( imports.Builder4.Globals.targetList);
+                                                                                                                this.el.drag_dest_set_target_list( imports.Builder3.Globals.targetList);

                                                                                                     },
                                                                                                     ready : false,
                                                                                                     getActiveNode : function(x,y)
                                                                                                     },
                                                                                                     ready : false,
                                                                                                     getActiveNode : function(x,y)


@@ -3847,7 +3847,7 @@ Window=new XObject({
                                                                                                                 self.drag_get_data
                                                                                                                 (  /* will receive 'drag-data-received' signal */
                                                                                                                         ctx,        /* represents the current state of the this.gDnD */
                                                                                                                 self.drag_get_data
                                                                                                                 (  /* will receive 'drag-data-received' signal */
                                                                                                                         ctx,        /* represents the current state of the this.gDnD */

-                                                                                                                        imports.Builder4.Globals.atoms["STRING"],    /* the target type we want */
+                                                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */

                                                                                                                         time            /* time stamp */
                                                                                                                 );
                                                                                                                 
                                                                                                                         time            /* time stamp */
                                                                                                                 );
                                                                                                                 


@@ -4022,7 +4022,7 @@ Window=new XObject({
                                         this.get('buttonbar').el.hide();
                                         this.get('viewbox').el.show();
                                         var ce = this.get('/Window.centereast').el;
                                         this.get('buttonbar').el.hide();
                                         this.get('viewbox').el.show();
                                         var ce = this.get('/Window.centereast').el;

-                                        print(JSON.(XObject.keys(ce) ,null,4));
+                                        print(JSON.stringify(XObject.keys(ce) ,null,4));

                                         ce.set_position(ce.get_allocated_width() - 150);
                                            
                                        // this.get('model').expanded();
                                         ce.set_position(ce.get_allocated_width() - 150);
                                            
                                        // this.get('model').expanded();


@@ -4203,7 +4203,7 @@ Window=new XObject({
                                                                 );
                                                                 //Gtk.drag_source_set_target_list(this.el, LeftTree.targetList);
                                                                
                                                                 );
                                                                 //Gtk.drag_source_set_target_list(this.el, LeftTree.targetList);
                                                                

-                                                                this.el.drag_source_set_target_list( imports.Builder4.Globals.targetList);
+                                                                this.el.drag_source_set_target_list( imports.Builder3.Globals.targetList);

                                                                 this.el.drag_source_add_text_targets( ); 
                                                                 /*
                                                                 print("RP: TARGET:" + LeftTree.atoms["STRING"]);
                                                                 this.el.drag_source_add_text_targets( ); 
                                                                 /*
                                                                 print("RP: TARGET:" + LeftTree.atoms["STRING"]);

diff --git a/ClutterTest/Window.js b/ClutterTest/Window.js
index 67d93a1..15ed84c 100644 (file)
--- a/ClutterTest/Window.js
+++ b/ClutterTest/Window.js
@@ -988,7 +988,7 @@ Window=new XObject({
                                                             return;
                                                         }
                                                         print("LOAD");
                                                             return;
                                                         }
                                                         print("LOAD");

-                                                        print(JSON.(f.items, null,4));
+                                                        print(JSON.stringify(f.items, null,4));

                                                         //console.dump(f.items);
                                                         this.load(f.items);
                                                         this.get('/LeftTree.view').el.expand_all();
                                                         //console.dump(f.items);
                                                         this.load(f.items);
                                                         this.get('/LeftTree.view').el.expand_all();


@@ -1166,7 +1166,7 @@ Window=new XObject({
                                                     }
                                                     o[i] = c[i];
                                                 }
                                                     }
                                                     o[i] = c[i];
                                                 }

-                                                return JSON.(o);
+                                                return JSON.stringify(o);

                                             },
                                             singleNodeToJS : function (treepath) 
                                                     {
                                             },
                                             singleNodeToJS : function (treepath) 
                                                     {


@@ -1217,7 +1217,7 @@ Window=new XObject({
                                                 
                                                 if (treepath === false) {
                                                     //dupe!!!
                                                 
                                                 if (treepath === false) {
                                                     //dupe!!!

-                                                    return JSON.parse(JSON.(ar));
+                                                    return JSON.parse(JSON.stringify(ar));

                                                 }
                                                 
                                                 return ar;
                                                 }
                                                 
                                                 return ar;


@@ -1268,8 +1268,8 @@ Window=new XObject({
                                                      var el = tree.getActivePath();
                                                      print(el);
                                                      var js = model.toJS(el, false);
                                                      var el = tree.getActivePath();
                                                      print(el);
                                                      var js = model.toJS(el, false);

-                                                    // print(JSON.(js[0], null,4));
-                                                     this.get('/DialogSaveTemplate').show(JSON.(js[0], null,4));
+                                                    // print(JSON.stringify(js[0], null,4));
+                                                     this.get('/DialogSaveTemplate').show(JSON.stringify(js[0], null,4));

                                                      
                                                     
                                                 }
                                                      
                                                     
                                                 }

diff --git a/DependTree/BuildLists.js b/DependTree/BuildLists.js
index acd5819..da200d5 100644 (file)
--- a/DependTree/BuildLists.js
+++ b/DependTree/BuildLists.js
@@ -76,7 +76,7 @@ function BuildLists () {
         //methods[cls] = {}
            
         implementations[odata.alias] = odata.titleType == 'Class' ? odata.childClasses :  odata.implementedBy;  
         //methods[cls] = {}
            
         implementations[odata.alias] = odata.titleType == 'Class' ? odata.childClasses :  odata.implementedBy;  

-        //print(JSON.(odata.methods,null,4));
+        //print(JSON.stringify(odata.methods,null,4));

         odata.methods.forEach(function(m) {
            
             m.params.forEach(function(p) {
         odata.methods.forEach(function(m) {
            
             m.params.forEach(function(p) {


@@ -127,8 +127,8 @@ function BuildLists () {
 
     this.implementations = implementations;
     
 
     this.implementations = implementations;
     

-    //print(JSON.(methods,null,4));
-    //print(JSON.(implementations,null,4));
+    //print(JSON.stringify(methods,null,4));
+    //print(JSON.stringify(implementations,null,4));

     
 }
 
     
 }
 

diff --git a/DependTree/Window.js b/DependTree/Window.js
index b1e1525..984b8b5 100644 (file)
--- a/DependTree/Window.js
+++ b/DependTree/Window.js
@@ -18,7 +18,7 @@ Window=new XObject({
             print("SHOW");
             var BuildLists = imports['BuildLists.js'].BuildLists;
             this.data = new BuildLists();
             print("SHOW");
             var BuildLists = imports['BuildLists.js'].BuildLists;
             this.data = new BuildLists();

-            print(JSON.(this.data.allmethods, null,4));
+            print(JSON.stringify(this.data.allmethods, null,4));

             
             var ls = this.get('method-list-store');
             this.data.allmethods.forEach(function(v) {
             
             var ls = this.get('method-list-store');
             this.data.allmethods.forEach(function(v) {


@@ -35,7 +35,7 @@ Window=new XObject({
                 i++;
                 ls.append( [ c , true ,   true]);
             };
                 i++;
                 ls.append( [ c , true ,   true]);
             };

-            print(JSON.(this.data.methods['Gtk.AccelGroup']));
+            print(JSON.stringify(this.data.methods['Gtk.AccelGroup']));

             
             
             
             
             
             


@@ -101,7 +101,7 @@ Window=new XObject({
                                         
                                                 
                                             }    
                                         
                                                 
                                             }    

-                                            print(JSON.(meths));
+                                            print(JSON.stringify(meths));

                                         
                                             tp = false; 
                                             var mstore = this.get('/window.method-list-store');
                                         
                                             tp = false; 
                                             var mstore = this.get('/window.method-list-store');


@@ -174,7 +174,7 @@ Window=new XObject({
                                                         
                                                              
                                                             var old = this.list.getValue(path, 1);
                                                         
                                                              
                                                             var old = this.list.getValue(path, 1);

-                                                           // print(JSON.(old));
+                                                           // print(JSON.stringify(old));

                                                             this.list.setValue(path, 1, old ? false : true)
                                                             
                                                             
                                                             this.list.setValue(path, 1, old ? false : true)
                                                             
                                                             


@@ -251,7 +251,7 @@ Window=new XObject({
                                                         
                                                              
                                                             var old = this.list.getValue(path, 1);
                                                         
                                                              
                                                             var old = this.list.getValue(path, 1);

-                                                           // print(JSON.(old));
+                                                           // print(JSON.stringify(old));

                                                             this.list.setValue(path, 1, old ? false : true)
                                                             
                                                             
                                                             this.list.setValue(path, 1, old ? false : true)
                                                             
                                                             


@@ -329,7 +329,7 @@ Window=new XObject({
                                                         
                                                              
                                                             var old = this.list.getValue(path, 1);
                                                         
                                                              
                                                             var old = this.list.getValue(path, 1);

-                                                           // print(JSON.(old));
+                                                           // print(JSON.stringify(old));

                                                             this.list.setValue(path, 1, old ? false : true)
                                                             
                                                             
                                                             this.list.setValue(path, 1, old ? false : true)
                                                             
                                                             

diff --git a/File.js b/File.js
index 21c8ef2..29cc5b9 100644 (file)
--- a/File.js
+++ b/File.js
@@ -78,7 +78,7 @@ var File = {
         var out = {};
         GLib.file_get_contents(path, out, null, null);
                
         var out = {};
         GLib.file_get_contents(path, out, null, null);
                

-               //print(JSON.(out));
+               print(JSON.stringify(out));

                
         return out['value'];
     },
                
         return out['value'];
     },

diff --git a/JSDOC/Collapse.js b/JSDOC/Collapse.js
index cd38c3f..71a89fd 100644 (file)
--- a/JSDOC/Collapse.js
+++ b/JSDOC/Collapse.js
@@ -122,7 +122,7 @@ Collapse = XObject.define(
                                     add.shift();
                                 }
                                 //Seed.print("ADD");
                                     add.shift();
                                 }
                                 //Seed.print("ADD");

-                                //Seed.print(JSON.(add, null,4));
+                                //Seed.print(JSON.stringify(add, null,4));

                                 
                                 
                                 
                                 
                                 
                                 

diff --git a/JSDOC/TokenReader.js b/JSDOC/TokenReader.js
index 47c6d42..c38e13b 100644 (file)
--- a/JSDOC/TokenReader.js
+++ b/JSDOC/TokenReader.js
@@ -149,7 +149,7 @@ TokenReader = XObject.define(
                     //Seed.print('(@' + n);
                     
                     var lt = this.lastSym(tokens, n);
                     //Seed.print('(@' + n);
                     
                     var lt = this.lastSym(tokens, n);

-                   Seed.print(JSON.(lt));
+                   Seed.print(JSON.stringify(lt));

                     if (lt.type != 'KEYW' || ['IF', 'WHILE'].indexOf(lt.name) < -1) {
                         if (!this.ignoreBadGrammer) {
                             throw {
                     if (lt.type != 'KEYW' || ['IF', 'WHILE'].indexOf(lt.name) < -1) {
                         if (!this.ignoreBadGrammer) {
                             throw {


@@ -202,7 +202,7 @@ TokenReader = XObject.define(
             
             if ((found == '}' || found == ']') && tokens.lastSym().data == ',') {
                 //print("Error - comma found before " + found);
             
             if ((found == '}' || found == ']') && tokens.lastSym().data == ',') {
                 //print("Error - comma found before " + found);

-                //print(JSON.(tokens.lastSym(), null,4));
+                //print(JSON.stringify(tokens.lastSym(), null,4));

                 if (this.ignoreBadGrammer) {
                     print("\n" + this.filename + ':' + this.line + " Error - comma found before " + found);
                 } else {
                 if (this.ignoreBadGrammer) {
                     print("\n" + this.filename + ':' + this.line + " Error - comma found before " + found);
                 } else {


@@ -232,7 +232,7 @@ TokenReader = XObject.define(
             if (found === "") {
                 return false;
             }
             if (found === "") {
                 return false;
             }

-            //print("WHITE = " + JSON.(found)); 
+            //print("WHITE = " + JSON.stringify(found)); 

             if (this.collapseWhite) found = " ";
             if (this.keepWhite) tokens.push(new Token(found, "WHIT", "SPACE", this.line));
             return true;
             if (this.collapseWhite) found = " ";
             if (this.keepWhite) tokens.push(new Token(found, "WHIT", "SPACE", this.line));
             return true;

diff --git a/JsParser.js b/JsParser.js
index 6662f10..adbc921 100644 (file)
--- a/JsParser.js
+++ b/JsParser.js
@@ -61,7 +61,7 @@ JsParser  =  XObject.define(
             }
             
             Seed.print("Unknown format");
             }
             
             Seed.print("Unknown format");

-            Seed.print(JSON.(this.tokens,null,4));
+            Seed.print(JSON.stringify(this.tokens,null,4));

             Seed.quit();
             
             
             Seed.quit();
             
             


@@ -228,7 +228,7 @@ JsParser  =  XObject.define(
                 throw "could not find top props...";
                 
             }
                 throw "could not find top props...";
                 
             }

-            //print(JSON.(topp,null,4));
+            //print(JSON.stringify(topp,null,4));

             
             this.cfg = this.parseProps(topp);
             for(var k in this.cfg) {
             
             this.cfg = this.parseProps(topp);
             for(var k in this.cfg) {


@@ -247,7 +247,7 @@ JsParser  =  XObject.define(
             
             
             this.cfg.modOrder = this.cfg.modKey.split('-').shift(); 
             
             
             this.cfg.modOrder = this.cfg.modKey.split('-').shift(); 

-            print(JSON.(this.cfg,null,4));
+            print(JSON.stringify(this.cfg,null,4));

             
             
             //                  (            {          add    { this.panel (  {
             
             
             //                  (            {          add    { this.panel (  {


@@ -267,7 +267,7 @@ JsParser  =  XObject.define(
             var cfg = this.tokens[2].props.create.val[2].items[1][3].items[0][0].props;
             this.cfg.type = 'Roo';
             //console.dump(this.tokens);
             var cfg = this.tokens[2].props.create.val[2].items[1][3].items[0][0].props;
             this.cfg.type = 'Roo';
             //console.dump(this.tokens);

-            //print(JSON.(cfg,null,4)); Seed.quit();
+            //print(JSON.stringify(cfg,null,4)); Seed.quit();

             
            // print("Trying standard dialog");Seed.quit();;
             
             
            // print("Trying standard dialog");Seed.quit();;
             


@@ -290,9 +290,9 @@ JsParser  =  XObject.define(
             var cfg = this.tokens[pos+1].items[0][0].props;
             this.cfg.items = [ this.parseProps(cfg) ];
             
             var cfg = this.tokens[pos+1].items[0][0].props;
             this.cfg.items = [ this.parseProps(cfg) ];
             

-            //print(JSON.(this.tokens[pos]));
+            //print(JSON.stringify(this.tokens[pos]));

             
             

-            //print(JSON.(this.tokens,null,4)); Seed.quit();
+            //print(JSON.stringify(this.tokens,null,4)); Seed.quit();

             //Seed.quit();
             
         },
             //Seed.quit();
             
         },


@@ -370,7 +370,7 @@ JsParser  =  XObject.define(
         
         parseProps:  function(o)
         {
         
         parseProps:  function(o)
         {

-            //print(JSON.(o,null,4));
+            //print(JSON.stringify(o,null,4));

             
             var ret = { };
             var fakeItems =  [];
             
             var ret = { };
             var fakeItems =  [];


@@ -523,7 +523,7 @@ JsParser  =  XObject.define(
         expand: function(ar)
         {
             var ret = '';
         expand: function(ar)
         {
             var ret = '';

-            //print(JSON.(ar,null,4));
+            //print(JSON.stringify(ar,null,4));

              
             for(var i =0 ; i < ar.length -1; i++) {
                 ret += ar[i].toRaw();
              
             for(var i =0 ; i < ar.length -1; i++) {
                 ret += ar[i].toRaw();


@@ -567,7 +567,7 @@ JsParser  =  XObject.define(
                 ar.push(l.substring(mindent));
             });
             //print(str);
                 ar.push(l.substring(mindent));
             });
             //print(str);

-            //print(JSON.(ar,null,4));
+            //print(JSON.stringify(ar,null,4));

             
             
             return ar.join("\n");
             
             
             return ar.join("\n");

diff --git a/Project/Base.js b/Project/Base.js
index 47c31bf..89eeca2 100644 (file)
--- a/Project/Base.js
+++ b/Project/Base.js
@@ -103,7 +103,7 @@ Base = XObject.define(
            // }
             
             
            // }
             
             

-            return JSON.(ret);
+            return JSON.stringify(ret);

           
           
         },
           
           
         },

diff --git a/ProjectManager.js b/ProjectManager.js
index 4c29121..5ae8d5a 100755 (executable)
--- a/ProjectManager.js
+++ b/ProjectManager.js
@@ -75,7 +75,7 @@ ProjectManager =  new Observable({
             
              
         }
             
              
         }

-//        print(JSON.(this.projects.length));Seed.quit();
+//        print(JSON.stringify(this.projects.length));Seed.quit();

    
         this.projects.sort(function(a,b) {
             if (a.getName() == b.getName()) {
    
         this.projects.sort(function(a,b) {
             if (a.getName() == b.getName()) {


@@ -124,7 +124,7 @@ ProjectManager =  new Observable({
     },
     update : function(proj) {
         
     },
     update : function(proj) {
         

-        Seed.print(JSON.(proj));
+        Seed.print(JSON.stringify(proj));

         var found = false;
         this.projects.forEach( function(p) {
             if (proj == p) {
         var found = false;
         this.projects.forEach( function(p) {
             if (proj == p) {

diff --git a/Sample/Window.js b/Sample/Window.js
index 6622391..04aaf2c 100644 (file)
--- a/Sample/Window.js
+++ b/Sample/Window.js
@@ -265,7 +265,7 @@ Window=new XObject({
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        

-                                                        var     jsstr = JSON.(js[0], null, 4);
+                                                        var     jsstr = JSON.stringify(js[0], null, 4);

                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +
                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +


@@ -1152,7 +1152,7 @@ Window=new XObject({
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");

-                                                                                        print(JSON.(f.items, null,4));
+                                                                                        print(JSON.stringify(f.items, null,4));

                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();
                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();


@@ -1331,7 +1331,7 @@ Window=new XObject({
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }

-                                                                                return JSON.(o);
+                                                                                return JSON.stringify(o);

                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {
                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {


@@ -1382,7 +1382,7 @@ Window=new XObject({
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!

-                                                                                    return JSON.parse(JSON.(ar));
+                                                                                    return JSON.parse(JSON.stringify(ar));

                                                                                 }
                                                                                 
                                                                                 return ar;
                                                                                 }
                                                                                 
                                                                                 return ar;


@@ -1433,8 +1433,8 @@ Window=new XObject({
                                                                                      var el = tree.getActivePath();
                                                                                      print(el);
                                                                                      var js = model.toJS(el, false);
                                                                                      var el = tree.getActivePath();
                                                                                      print(el);
                                                                                      var js = model.toJS(el, false);

-                                                                                    // print(JSON.(js[0], null,4));
-                                                                                     this.get('/DialogSaveTemplate').show(JSON.(js[0], null,4));
+                                                                                    // print(JSON.stringify(js[0], null,4));
+                                                                                     this.get('/DialogSaveTemplate').show(JSON.stringify(js[0], null,4));

                                                                                      
                                                                                     
                                                                                 }
                                                                                      
                                                                                     
                                                                                 }


@@ -2418,7 +2418,7 @@ Window=new XObject({
                                                                         }
                                                                         
                                                                         
                                                                         }
                                                                         
                                                                         

-                                                                        //print(JSON.(ar));
+                                                                        //print(JSON.stringify(ar));

                                                                         return ar;
                                                                         // convert the l
                                                                     },
                                                                         return ar;
                                                                         // convert the l
                                                                     },


@@ -3183,14 +3183,14 @@ Window=new XObject({
                                                                                         
                                                                                         
                                                                                         this.renderedData = data;
                                                                                         
                                                                                         
                                                                                         this.renderedData = data;

-                                                                                        var str = JSON.(data) ;
+                                                                                        var str = JSON.stringify(data) ;

                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         }
                                                                                         this.lastRedraw = new Date();
                                                                                     
                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         }
                                                                                         this.lastRedraw = new Date();
                                                                                     

-                                                                                        this.el.execute_script("Builder.render(" + JSON.(data) + ");");
+                                                                                        this.el.execute_script("Builder.render(" + JSON.stringify(data) + ");");

                                                                                          print( "before render" +    this.lastRedraw);
                                                                                         print( "after render" +    (new Date()));
                                                                                         
                                                                                          print( "before render" +    this.lastRedraw);
                                                                                         print( "after render" +    (new Date()));
                                                                                         

diff --git a/XObjectBase/GtkClutterActor.js b/XObjectBase/GtkClutterActor.js
index 2ff4fbe..3698558 100644 (file)
--- a/XObjectBase/GtkClutterActor.js
+++ b/XObjectBase/GtkClutterActor.js
@@ -49,7 +49,7 @@ GtkClutterActor = XObject.define(
             child.parent = this;
             //var contents = new Gtk.Button({ label: 'test' }); 
             
             child.parent = this;
             //var contents = new Gtk.Button({ label: 'test' }); 
             

-           // print(JSON.(this.items));
+           // print(JSON.stringify(this.items));

             child.el.show();
             
             this.el = new GtkClutter.Actor.with_contents (  child.el) ;
             child.el.show();
             
             this.el = new GtkClutter.Actor.with_contents (  child.el) ;

diff --git a/bjstester.js b/bjstester.js
index 6e8c854..554c391 100644 (file)
--- a/bjstester.js
+++ b/bjstester.js
@@ -26,7 +26,7 @@ var args = Array.prototype.slice.call(Seed.argv);
 
 args.shift();
 args.shift();
 
 args.shift();
 args.shift();

-//print(JSON.(args, null,4));
+//print(JSON.stringify(args, null,4));

 //Seed.quit();
 
 
 //Seed.quit();
 
 


@@ -59,6 +59,6 @@ function bjstest(fn) {
     }, true);
     
 }
     }, true);
     
 }

-//print(JSON.(rf.cfg, null,4));
+//print(JSON.stringify(rf.cfg, null,4));

  
  
  
  

diff --git a/builder.html.js b/builder.html.js
index cd7fd5d..ee57edd 100644 (file)
--- a/builder.html.js
+++ b/builder.html.js
@@ -109,7 +109,7 @@ Builder  = {
                 
             } catch( e) {
                 console.log(e);
                 
             } catch( e) {
                 console.log(e);

-                console.log(JSON.(e));
+                console.log(JSON.stringify(e));

                 // reload!!?
             }
             
                 // reload!!?
             }
             


@@ -260,7 +260,7 @@ Builder  = {
                    // }
                    
                 } catch(e) {  
                    // }
                    
                 } catch(e) {  

-                    console.log('Error evaluating: '  + cfg[p] + "\r\n" + JSON.(e)); 
+                    console.log('Error evaluating: '  + cfg[p] + "\r\n" + JSON.stringify(e)); 

                 };
                 if (pp != p) {
                     delete cfg[p];
                 };
                 if (pp != p) {
                     delete cfg[p];

diff --git a/dbgenerate.js b/dbgenerate.js
index bd5db03..0ea16fd 100644 (file)
--- a/dbgenerate.js
+++ b/dbgenerate.js
@@ -65,7 +65,7 @@ var o = new Options({
 
 
 var cfg = o.parse(Seed.argv);
 
 
 var cfg = o.parse(Seed.argv);

-print(JSON.(cfg, null,4));
+print(JSON.stringify(cfg, null,4));

 
 var   cnc = Gda.Connection.open_from_string (cfg.DBTYPE,
          "DB_NAME=" + cfg.DBNAME, 
 
 var   cnc = Gda.Connection.open_from_string (cfg.DBTYPE,
          "DB_NAME=" + cfg.DBNAME, 


@@ -84,7 +84,7 @@ Gda.DataSelect.prototype.fetchAll = function()
     for (var i =0;i < this.get_n_columns(); i++) {
         cols.push(this.get_column_name(i));
     }
     for (var i =0;i < this.get_n_columns(); i++) {
         cols.push(this.get_column_name(i));
     }

-    //print(JSON.(cols, null,4));
+    //print(JSON.stringify(cols, null,4));

     var iter = this.create_iter();
     var res = [];
     //print(this.get_n_rows());
     var iter = this.create_iter();
     var res = [];
     //print(this.get_n_rows());


@@ -232,7 +232,7 @@ if (File.isDirectory(cfg.INI)) {
     
     
 }
     
     
 }

-//print(JSON.(ini, null,4));
+//print(JSON.stringify(ini, null,4));

  //console.dump(ini);
 print("DONE INI");
 
  //console.dump(ini);
 print("DONE INI");
 


@@ -298,7 +298,7 @@ switch(cfg.DBTYPE) {
  
 
 var tables = cnc.execute_select_command( query_tables).fetchAll();
  
 
 var tables = cnc.execute_select_command( query_tables).fetchAll();

-print(JSON.(tables));
+print(JSON.stringify(tables));

 
 var readers = [];
 tables.forEach(function(table) {
 
 var readers = [];
 tables.forEach(function(table) {


@@ -316,7 +316,7 @@ tables.forEach(function(table) {
        
     var firstTxtCol = '';
     
        
     var firstTxtCol = '';
     

-    //print(JSON.(schema, null,4));    Seed.quit();
+    //print(JSON.stringify(schema, null,4));    Seed.quit();

     
     schema.forEach(function(e)  {
         e.Type = e.Type || e.type;
     
     schema.forEach(function(e)  {
         e.Type = e.Type || e.type;


@@ -470,7 +470,7 @@ tables.forEach(function(table) {
                         'id' : 'id',
                         'root' : 'data',
                         'totalProperty' : 'total',
                         'id' : 'id',
                         'root' : 'data',
                         'totalProperty' : 'total',

-                        '|fields' : JSON.(combofields)
+                        '|fields' : JSON.stringify(combofields)

                         
                     }
                 ]
                         
                     }
                 ]


@@ -481,13 +481,13 @@ tables.forEach(function(table) {
     
     
     
     
     
     

-    //print(JSON.(reader,null,4));
+    //print(JSON.stringify(reader,null,4));

     readers.push({
         table : table ,
         combo : combo,
         combofields : combofields,
         reader :  reader,
     readers.push({
         table : table ,
         combo : combo,
         combofields : combofields,
         reader :  reader,

-        oreader : JSON.parse(JSON.(reader)), // dupe it..
+        oreader : JSON.parse(JSON.stringify(reader)), // dupe it..

         colmodel : colmodel,
         firstTxtCol : firstTxtCol,
         form : form
         colmodel : colmodel,
         firstTxtCol : firstTxtCol,
         form : form


@@ -531,14 +531,14 @@ readers.forEach(function(reader) {
             continue;
         }
         if (typeof(reader.form[col]) == 'undefined') {
             continue;
         }
         if (typeof(reader.form[col]) == 'undefined') {

-            print (JSON.(reader.form, null,4));
+            print (JSON.stringify(reader.form, null,4));

             print("missing linked column " + col);
             continue;
         }
         
         var combofields_name = add.combofields[1].name;
         var old =   reader.form[col];
             print("missing linked column " + col);
             continue;
         }
         
         var combofields_name = add.combofields[1].name;
         var old =   reader.form[col];

-        reader.form[col] = JSON.parse(JSON.(add.combo)); // clone
+        reader.form[col] = JSON.parse(JSON.stringify(add.combo)); // clone

         reader.form[col].queryParam  = 'query[' + combofields_name + ']';// SET WHEN USED
         reader.form[col].fieldLabel = old.fieldLabel;  // SET WHEN USED
         reader.form[col].hiddenName = old.name; // SET WHEN USED eg. project_id
         reader.form[col].queryParam  = 'query[' + combofields_name + ']';// SET WHEN USED
         reader.form[col].fieldLabel = old.fieldLabel;  // SET WHEN USED
         reader.form[col].hiddenName = old.name; // SET WHEN USED eg. project_id


@@ -560,7 +560,7 @@ readers.forEach(function(reader) {
 
 
 
 
 
 

-//print(JSON.(readers, null, 4));
+//print(JSON.stringify(readers, null, 4));

 
 readers.forEach(function(reader) {
     
 
 readers.forEach(function(reader) {
     


@@ -583,12 +583,12 @@ readers.forEach(function(reader) {
         '*prop' : "reader",
         id : 'id', // maybe no..
        
         '*prop' : "reader",
         id : 'id', // maybe no..
        

-        '|fields' :  JSON.(reader.reader, null,4).replace(/"/g,"'")
+        '|fields' :  JSON.stringify(reader.reader, null,4).replace(/"/g,"'")

     };
     
     File.write(
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
     };
     
     File.write(
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',

-        JSON.(jreader, null, 4)
+        JSON.stringify(jreader, null, 4)

     )
     
     
     )
     
     


@@ -606,7 +606,7 @@ readers.forEach(function(reader) {
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        

-        JSON.({
+        JSON.stringify({

             '|xns' : 'Roo',
             xtype : "GridPanel",
             "title": reader.table,
             '|xns' : 'Roo',
             xtype : "GridPanel",
             "title": reader.table,


@@ -807,7 +807,7 @@ readers.forEach(function(reader) {
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        

-        JSON.( frmCfg, null, 4)
+        JSON.stringify( frmCfg, null, 4)

     );
             
             
     );
             
             


@@ -828,7 +828,7 @@ readers.forEach(function(reader) {
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        

-        JSON.(reader.combo, null, 4)
+        JSON.stringify(reader.combo, null, 4)

     );
             
    
     );
             
    


@@ -859,7 +859,7 @@ readers.forEach(function(reader) {
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        
         dir + '/' + cfg.DBNAME + '_' + reader.table + '.json',
             
        

-        JSON.({
+        JSON.stringify({

        
             "closable": false,
             "collapsible": false,
        
             "closable": false,
             "collapsible": false,

diff --git a/gtkrun.js b/gtkrun.js
index f3c4eb9..1ec53ad 100644 (file)
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -32,7 +32,7 @@ GLib        = imports.gi.GLib;
 
 // we add this in, as it appears to get lost sometimes if we set it using the ENV. variable in builder.sh
 GIRepository.Repository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.2');
 
 // we add this in, as it appears to get lost sometimes if we set it using the ENV. variable in builder.sh
 GIRepository.Repository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.2');

-//print(JSON.(GIRepository.IRepository.get_search_path()));
+//print(JSON.stringify(GIRepository.IRepository.get_search_path()));

 
 Gtk         = imports.gi.Gtk;
 Gdk         = imports.gi.Gdk;
 
 Gtk         = imports.gi.Gtk;
 Gdk         = imports.gi.Gdk;

diff --git a/rconv.js b/rconv.js
index a094a3f..a7be79d 100644 (file)
--- a/rconv.js
+++ b/rconv.js
@@ -26,7 +26,7 @@ var args = Array.prototype.slice.call(Seed.argv);
 
 args.shift();
 args.shift();
 
 args.shift();
 args.shift();

-//print(JSON.(args, null,4));
+//print(JSON.stringify(args, null,4));

 //Seed.quit();
 
 
 //Seed.quit();
 
 


@@ -88,7 +88,7 @@ function createTest(fn, force) {
     
     
     var rf = new JsParser(toks);
     
     
     var rf = new JsParser(toks);

-    //print(JSON.(rf.tokens, null,4));Seed.quit();
+    //print(JSON.stringify(rf.tokens, null,4));Seed.quit();

     rf.parse();
     
     
     rf.parse();
     
     


@@ -96,7 +96,7 @@ function createTest(fn, force) {
         File.remove('/tmp/rconv_genbjs/' + GLib.basename(fn).replace(/\.js$/,'.bjs') );
     }
     File.write('/tmp/rconv_genbjs/' + GLib.basename(fn).replace(/\.js$/,'.bjs'),
         File.remove('/tmp/rconv_genbjs/' + GLib.basename(fn).replace(/\.js$/,'.bjs') );
     }
     File.write('/tmp/rconv_genbjs/' + GLib.basename(fn).replace(/\.js$/,'.bjs'),

-               JSON.(rf.cfg,null,4));
+               JSON.stringify(rf.cfg,null,4));

 
     
      
 
     
      


@@ -112,6 +112,6 @@ function createTest(fn, force) {
     
     File.write('/tmp/rconv_gen/' + GLib.basename(fn) , res);
 }
     
     File.write('/tmp/rconv_gen/' + GLib.basename(fn) , res);
 }

-//print(JSON.(rf.cfg, null,4));
+//print(JSON.stringify(rf.cfg, null,4));

  
  
  
  

diff --git a/tools/Sample/Window.js b/tools/Sample/Window.js
index 6622391..04aaf2c 100644 (file)
--- a/tools/Sample/Window.js
+++ b/tools/Sample/Window.js
@@ -265,7 +265,7 @@ Window=new XObject({
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        

-                                                        var     jsstr = JSON.(js[0], null, 4);
+                                                        var     jsstr = JSON.stringify(js[0], null, 4);

                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +
                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +


@@ -1152,7 +1152,7 @@ Window=new XObject({
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");

-                                                                                        print(JSON.(f.items, null,4));
+                                                                                        print(JSON.stringify(f.items, null,4));

                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();
                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();


@@ -1331,7 +1331,7 @@ Window=new XObject({
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }

-                                                                                return JSON.(o);
+                                                                                return JSON.stringify(o);

                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {
                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {


@@ -1382,7 +1382,7 @@ Window=new XObject({
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!

-                                                                                    return JSON.parse(JSON.(ar));
+                                                                                    return JSON.parse(JSON.stringify(ar));

                                                                                 }
                                                                                 
                                                                                 return ar;
                                                                                 }
                                                                                 
                                                                                 return ar;


@@ -1433,8 +1433,8 @@ Window=new XObject({
                                                                                      var el = tree.getActivePath();
                                                                                      print(el);
                                                                                      var js = model.toJS(el, false);
                                                                                      var el = tree.getActivePath();
                                                                                      print(el);
                                                                                      var js = model.toJS(el, false);

-                                                                                    // print(JSON.(js[0], null,4));
-                                                                                     this.get('/DialogSaveTemplate').show(JSON.(js[0], null,4));
+                                                                                    // print(JSON.stringify(js[0], null,4));
+                                                                                     this.get('/DialogSaveTemplate').show(JSON.stringify(js[0], null,4));

                                                                                      
                                                                                     
                                                                                 }
                                                                                      
                                                                                     
                                                                                 }


@@ -2418,7 +2418,7 @@ Window=new XObject({
                                                                         }
                                                                         
                                                                         
                                                                         }
                                                                         
                                                                         

-                                                                        //print(JSON.(ar));
+                                                                        //print(JSON.stringify(ar));

                                                                         return ar;
                                                                         // convert the l
                                                                     },
                                                                         return ar;
                                                                         // convert the l
                                                                     },


@@ -3183,14 +3183,14 @@ Window=new XObject({
                                                                                         
                                                                                         
                                                                                         this.renderedData = data;
                                                                                         
                                                                                         
                                                                                         this.renderedData = data;

-                                                                                        var str = JSON.(data) ;
+                                                                                        var str = JSON.stringify(data) ;

                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         }
                                                                                         this.lastRedraw = new Date();
                                                                                     
                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
                                                                                         }
                                                                                         this.lastRedraw = new Date();
                                                                                     

-                                                                                        this.el.execute_script("Builder.render(" + JSON.(data) + ");");
+                                                                                        this.el.execute_script("Builder.render(" + JSON.stringify(data) + ");");

                                                                                          print( "before render" +    this.lastRedraw);
                                                                                         print( "after render" +    (new Date()));
                                                                                         
                                                                                          print( "before render" +    this.lastRedraw);
                                                                                         print( "after render" +    (new Date()));
                                                                                         

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index 0c7b2bc..15472bd 100644 (file)
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -69,10 +69,10 @@ function BuildLists () {
             classes[odata.alias] = odata;
         });
     });
             classes[odata.alias] = odata;
         });
     });

-    //print(JSON.(classes['Gtk.CellRenderer'] , null, 4));
-    //print(JSON.(classes['Gtk.CellRenderer'].titleType, null, 4));
-    //print(JSON.(classes['Gtk.CellRenderer'].childClasses, null, 4));
-    //print(JSON.(classes['Gtk.CellRenderer'].implementedBy, null, 4));
+    //print(JSON.stringify(classes['Gtk.CellRenderer'] , null, 4));
+    //print(JSON.stringify(classes['Gtk.CellRenderer'].titleType, null, 4));
+    //print(JSON.stringify(classes['Gtk.CellRenderer'].childClasses, null, 4));
+    //print(JSON.stringify(classes['Gtk.CellRenderer'].implementedBy, null, 4));

           
     
 
           
     
 


@@ -108,7 +108,7 @@ function BuildLists () {
        
         
         //print(cls);
        
         
         //print(cls);

-        //print(JSON.(odata.methods,null,4));
+        //print(JSON.stringify(odata.methods,null,4));

         odata.methods.forEach(function(m) {
             
             
         odata.methods.forEach(function(m) {
             
             


@@ -117,14 +117,14 @@ function BuildLists () {
              if (!m.name.match(/^(add|pack)/)) {
                 return;
             }
              if (!m.name.match(/^(add|pack)/)) {
                 return;
             }

-            //print(JSON.(m,null,4));
+            //print(JSON.stringify(m,null,4));

             m.params.forEach(function(p) {
                  
                 if (!p.type || typeof(classes[p.type]) == 'undefined') {
                     return;
                 }
                 // now add it..
             m.params.forEach(function(p) {
                  
                 if (!p.type || typeof(classes[p.type]) == 'undefined') {
                     return;
                 }
                 // now add it..

-                //print(JSON.(p));Seed.exit();
+                //print(JSON.stringify(p));Seed.exit();

                 var addable_type = p.type;
                 if (addable_type.indexOf('.') < 0) {
                     addable_type = p.memberOf + '.' + p.type;
                 var addable_type = p.type;
                 if (addable_type.indexOf('.') < 0) {
                     addable_type = p.memberOf + '.' + p.type;


@@ -181,13 +181,13 @@ function BuildLists () {
                 });
                 // also needs to add
                 //print(addable_type);
                 });
                 // also needs to add
                 //print(addable_type);

-                //print(JSON.(implementations[addable_type], null,4));
+                //print(JSON.stringify(implementations[addable_type], null,4));

                  
                 
                 implementations[addable_type].forEach(function(addable_child) {
                     
                     //if (addable_child == 'Gtk.AboutDialog') {
                  
                 
                 implementations[addable_type].forEach(function(addable_child) {
                     
                     //if (addable_child == 'Gtk.AboutDialog') {

-                    //    print(JSON.(methods[addable_child].extendsClasses,null,4));Seed.exit();
+                    //    print(JSON.stringify(methods[addable_child].extendsClasses,null,4));Seed.exit();

                         
                     //}
                     
                         
                     //}
                     


@@ -267,7 +267,7 @@ function BuildLists () {
     this.methods = methods;
     this.allmethods = methods;
     this.implementations = implementations;
     this.methods = methods;
     this.allmethods = methods;
     this.implementations = implementations;

-    //print(JSON.(methods,null,4)); Seed.exit();
+    //print(JSON.stringify(methods,null,4)); Seed.exit();

     // dump out a usage file..
        this.failed = [];
     var failed = this.failed;
     // dump out a usage file..
        this.failed = [];
     var failed = this.failed;


@@ -305,7 +305,7 @@ function BuildLists () {
         } catch(e) {
             failed.push(parent);
             print("TRY ctor:  " + parent );
         } catch(e) {
             failed.push(parent);
             print("TRY ctor:  " + parent );

-            print(JSON.(e));
+            print(JSON.stringify(e));

             return false;
         }
         
             return false;
         }
         


@@ -432,13 +432,13 @@ right:
         }
         lefts[left].push(par);
     }
         }
         lefts[left].push(par);
     }

-    print (JSON.(lefts,null,4));
+    print (JSON.stringify(lefts,null,4));

     Seed.quit();
         
         
         
         
     Seed.quit();
         
         
         
         

-    print (JSON.(usage,null,4));
+    print (JSON.stringify(usage,null,4));

     var nusage = {};
        var usage_left = {};
     for(var par in usage) {
     var nusage = {};
        var usage_left = {};
     for(var par in usage) {


@@ -468,8 +468,8 @@ right:
         
     }
     usage = nusage;
         
     }
     usage = nusage;

-    //print(JSON.(nusage,null,4));  Seed.exit();
-    print(JSON.(methods['Gtk.TextView'],null,4));
+    //print(JSON.stringify(nusage,null,4));  Seed.exit();
+    print(JSON.stringify(methods['Gtk.TextView'],null,4));

 
     var str = [];
        for(var par in usage) {
 
     var str = [];
        for(var par in usage) {


@@ -483,7 +483,7 @@ right:
                str.push('');
        }
        print(str.join("\n"));
                str.push('');
        }
        print(str.join("\n"));

-    //print(JSON.(implementations ,null,4));
+    //print(JSON.stringify(implementations ,null,4));

     /*
       methods is
         [a class]
     /*
       methods is
         [a class]


@@ -514,7 +514,7 @@ right:
     */
     
     
     */
     
     

-    //print(JSON.(implementations,null,4));
+    //print(JSON.stringify(implementations,null,4));

     
 }
 imports.gi.Gtk.init(Seed.argv);
     
 }
 imports.gi.Gtk.init(Seed.argv);