Merge branch 'master' of http://git.roojs.com:8081/app.Builder.js

[app.Builder.js] / XObject.js

diff --git a/XObject.js b/XObject.js
index 856aa16..7ed3d1c 100644 (file)
--- a/XObject.js
+++ b/XObject.js
@@ -44,12 +44,7 @@ GObject = imports.gi.GObject;
  * @cfg listeners {Object}   (optional) map Gobject signals to functions
  * @cfg pack {Function|String|Array}   (optional) how this object gets added to it's parent
  * @cfg el {Object}   (optional) premade GObject
- * 
- * 
- * 
- * 
- * 
- * 
+ *  
  */
 
 function XObject (cfg) {
@@ -62,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..
@@ -71,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);
         }
         
     }
@@ -120,23 +120,26 @@ function XObject (cfg) {
     // interesting question should we call constructor on items here...
     // as the real work is done in init anyway..
     var _this= this;
-    
-    var items = [];
-    this.items.forEach(function(i) {
-        items.push(i);
-    });
+ 
+    var items = []
+    for(var i = 0; i < this.items.length;i++) {
+       items.push(this.items[i]);
+    }
+
+
+
     this.items = [];
     // create XObject for all the children.
-    items.forEach(function(i,n) {
-         
-        var item = (i.constructor == XObject) ? i : new XObject(i);
+    for(var i = 0; i < items.length;i++) {
+    
+        var base = XObject.baseXObject(items[i]);
+        base = base || XObject;
+        var item = (items[i].constructor == XObject) ? items[i] : new base(items[i]);
         item.parent = _this;
         _this.items.push(item);
         //_this.addItem(i);
-    });
-    if (this.onConstruct) {
-        this.onConstruct.call(this);
-    }
+    };
+     
     
 }
 
@@ -167,7 +170,7 @@ XObject.prototype = {
       * XObject.prototype.init.call(this); 
       * 
       */ 
-    init : function()
+    init : function(parent)
     {
          
        // var items = [];
@@ -259,9 +262,9 @@ XObject.prototype = {
         XObject.log("add children to " + type);
         
         var _this=this;
-        this.items.forEach(function(i,n) {
-            _this.addItem(i,n);
-        })
+        for (var i = 0; i < this.items.length;i++) { 
+            _this.addItem(this.items[i],i);
+        }
             
         
         for (var i in this.listeners) {
@@ -278,7 +281,6 @@ XObject.prototype = {
       
      
      /**
-      * @method addItem
       * Adds an item to the object using a new XObject
       * uses pack property to determine how to add it.
       * @arg cfg {Object} same as XObject constructor.
@@ -293,7 +295,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) {
@@ -301,7 +303,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;
@@ -366,12 +368,11 @@ XObject.prototype = {
         
     },
     /**
-      * @method addListener
-      * Connects a method to a signal. (gjs/Seed aware)
-      * 
-      * @arg sig  {String} name of signal
-      * @arg fn  {Function} handler.
-      */
+    * Connects a method to a signal. (gjs/Seed aware)
+    * 
+    * @param {String} sig  name of signal
+    * @param {Function} fn  handler.
+    */
     addListener  : function(sig, fn) 
     {
  
@@ -396,8 +397,8 @@ XObject.prototype = {
       * prefix with multiple '..' to look further up..
       * prefix with '/' to look from the top, eg. '^LeftTree.model'
       * 
-      * @arg name  {String} name of signal
-      * @return   {XObject|false} the object if found.
+      * @param {String} name name of signal
+      * @return  {XObject|false} the object if found.
       */
     get : function(xid)
     {
@@ -713,7 +714,7 @@ XObject.extend(XObject,
         return ret;
     },
     /**
-     * return the Gobject name of a constructor
+     * return the Gobject name of a constructor - does not appear to work on structs..
      * @param {Object} gobject ctr
      * @return {String} returns name
      * @member XObject type
@@ -742,10 +743,17 @@ XObject.extend(XObject,
                 gname = XObject.type(cfg.xtype);
             
             }
+            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;
             
@@ -786,4 +794,4 @@ XObject.extend(XObject,
             };
     }
     
-});
\ No newline at end of file
+});