config1.builder

[gitlive] / XObject.js

diff --git a/XObject.js b/XObject.js
index 50f1bbd..1d9bcf0 100644 (file)
--- a/XObject.js
+++ b/XObject.js
@@ -1,6 +1,6 @@
 //<script type="text/javascript">
-GIRepository = imports.gi.GIRepository;
-GObject = imports.gi.GObject;
+const GIRepository = imports.gi.GIRepository;
+const GObject = imports.gi.GObject;
 /**
  * XObject
  * Yet another attempt to create a usable object construction library for seed..
@@ -57,6 +57,11 @@ function XObject (cfg) {
     
     this.cfg = XObject.extend({}, cfg); // used to store original configuration.. for referencing..
     
+    // used by baseobject to create fake child elements on init..
+    if (cfg.el) {
+        this.el = cfg.el;
+    }
+    
     // we could use this to determine if 
     // we are actually inside a inherited class...
     // as define() should actually set this up..
@@ -66,7 +71,7 @@ function XObject (cfg) {
         this.constructor = XObject;
         var base = XObject.baseXObject(cfg);
         if (base) {
-            XObject.extend(this,base.prototype);
+            XObject.extend(this,  base.prototype);
         }
         
     }
@@ -123,7 +128,7 @@ function XObject (cfg) {
 
 
 
-       this.items = [];
+    this.items = [];
     // create XObject for all the children.
     for(var i = 0; i < items.length;i++) {
     
@@ -165,7 +170,7 @@ XObject.prototype = {
       * XObject.prototype.init.call(this); 
       * 
       */ 
-    init : function()
+    init : function(parent)
     {
          
        // var items = [];
@@ -186,14 +191,42 @@ XObject.prototype = {
          
         // xtype= Gtk.Menu ?? what about c_new stuff?
         XObject.log("init: ID:"+ this.id +" typeof(xtype): "  + typeof(this.xtype));
-        if (!this.el && typeof(this.xtype) == 'function') {
+               
+               var xtypeof = isSeed ? typeof(this.xtype) :
+                       // oterhwise it's gjs, which case ctors are functions, not objects...
+                       ( typeof(this.xtype) == 'function' ? 'object' : typeof(this.xtype) );
+               
+        if (!this.el && xtypeof == 'function') {
             XObject.log("func?"  + XObject.keys(this.config).join(','));
             this.el = this.xtype(this.config);
            
         }
-        if (!this.el && typeof(this.xtype) == 'object') {
+        if (!this.el && xtypeof == 'object') {
+            XObject.log(this.xtype.toString());
+            
             XObject.log("obj?"  + XObject.keys(this.config).join(','));
-            this.el = new (this.xtype)(this.config);
+            try {
+                               if (!isSeed) {
+                                       // gjs does not like properties that do not exist..
+                                       
+                                       this.el = new (this.xtype)({});
+                                       XObject.extend(this.el, this.config);
+                                
+                               } else {
+                               
+                                       this.el = new (this.xtype)(this.config);
+                               }
+            } catch(e) {
+                print(JSON.stringify(e,null,4));
+                print(JSON.stringify(this.config,null,4));
+                print(e.stack);
+                
+                 throw {
+                    name: "ArgumentError", 
+                    message :"Error creating object from xtype(object)"
+                 };
+            }
+              
       
         }
         //print(this.el);
@@ -253,7 +286,7 @@ XObject.prototype = {
          //   XObject.registry[o.xnsid][o.id] = this;
         //}
         
-        var type = this.xtype.type ? GObject.type_name(this.xtype.type) : '';
+        var type = this.xtype && this.xtype.type ? GObject.type_name(this.xtype.type) : '';
         XObject.log("add children to " + type);
         
         var _this=this;
@@ -290,7 +323,7 @@ XObject.prototype = {
         }
         // what about extended items!?!?!?
        
-        item.init();
+        item.init(this);
         //print("CTR:PROTO:" + ( item.id ? item.id : '??'));
        // print("addItem - call init [" + item.pack.join(',') + ']');
         if (!item.el) {
@@ -298,7 +331,7 @@ XObject.prototype = {
             imports.console.dump(item);
             Seed.quit();
         }
-        print(XObject.type(this.xtype) + ":pack=" + item.pack);
+        XObject.log(XObject.type(this.xtype) + ":pack=" + item.pack);
         
         if (item.pack===false) {  // no packing.. various items have this ..
             return;
@@ -376,6 +409,13 @@ XObject.prototype = {
         var _li = XObject.createDelegate(fn,this);
         // private listeners that are not copied to GTk.
         
+               if (!this.el) {
+                       print('missing el?');
+                       print(fn);
+                       print(JSON.stringify(this.cfg));
+                       }
+               
+               
         if (typeof(Seed) != 'undefined') {
           //   Seed.print(typeof(_li));
             this.el.signal[sig].connect(_li);
@@ -602,7 +642,11 @@ XObject.extend(XObject,
                     
             }
     },
-   
+       /**
+        * usefull for compatibilyt.
+        *
+        */
+    isSeed : typeof(Seed) != 'undefined',
     /**
      * Copies all the properties of config to obj, if the do not exist.
      * @param {Object} obj The receiver of the properties
@@ -738,10 +782,18 @@ XObject.extend(XObject,
                 gname = XObject.type(cfg.xtype);
             
             }
-            print("TRYING BASE OBJECT : " + gname);
+            if (typeof(cfg.xtype) == 'string') {
+                gname  = cfg.xtype;
+            }
+            
+            XObject.log("TRYING BASE OBJECT : " + gname);
+                         
             // in the situation where we have been called and there is a base object
             // defining the behavior..
             // then we should copy the prototypes from the base object into this..
+            
+            // see if file exists???
+            
             var base = gname  ? imports.XObjectBase[gname][gname] : false;
             return base;