Version 0.6.141, fix X.UI.ScrollBox.

[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 14_ChromeBox.js

diff --git a/0.6.x/js/20_ui/14_ChromeBox.js b/0.6.x/js/20_ui/14_ChromeBox.js
index 4089730..5935ebd 100644 (file)
--- a/0.6.x/js/20_ui/14_ChromeBox.js
+++ b/0.6.x/js/20_ui/14_ChromeBox.js
@@ -1,45 +1,56 @@
-X.UI._ChromeBox = X.UI._Box.inherits(\r
+var XUI_ChromeBox = XUI_Box.inherits(\r
        '_ChromeBox',\r
-       X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS,\r
+       X_Class.PRIVATE_DATA,\r
        {\r
                chromeNodes   : null,\r
                containerNode : null,\r
                \r
                Constructor : function( layout, args ){\r
+                       var uinodes, i, l, node, after, index = 0;\r
                        \r
-                       this.Super( layout, args );\r
-                       \r
-                       // xnode の追加が可能\r
-                       \r
-                       var uinodes = this.uinodes,\r
-                               i     = uinodes.length,\r
-                               node;\r
+                       this[ 'Super' ]( layout, args );\r
+\r
+                       uinodes = this.uinodes;\r
+                       l = i   = uinodes.length;\r
+\r
                        for( ; i; ){\r
                                node = uinodes[ --i ];\r
-                               if( node.forContainer === true ){\r
+                               if( node.role === 3 ){\r
                                        if( this.containerNode ){\r
                                                //throw new Error( 'ContainerNode　が複数設定されています！ContainerNode はクロームボックスにひとつ、生成時に設定できます ' + node );\r
                                        };\r
-                                       this.containerNode = node;\r
+                                       this.containerNode = node.User;\r
+                                       this._containerNode = node;\r
                                } else {\r
-                                       if( !this.chromeNodes  ) this.chromeNodes = [];\r
+                                       if( !this.chromeNodes ) this.chromeNodes = [];\r
                                        this.chromeNodes[ this.chromeNodes.length ] = node;\r
                                };\r
                        };\r
                        if( !this.containerNode ){\r
                                //throw new Error( 'ContainerNode が設定されてい\ません！ContainerNode はクロームボックスにひとつ、生成時に設定できます ' );\r
                        };\r
+                       \r
+                       for( i = 0, l = args.length; i < l; ++i ){\r
+                               node = args[ i ];\r
+                               if( node === this.containerNode ){\r
+                                       after = true;\r
+                                       index = 0;\r
+                               };\r
+                               if( node[ 'instanceOf' ] && node[ 'instanceOf' ]( Node ) ){\r
+                                       \r
+                               };\r
+                       };\r
                }\r
        }\r
 );\r
 \r
 X.UI.ChromeBox = X.UI.Box.inherits(\r
        'ChromeBox',\r
-       X.Class.SUPER_ACCESS,\r
-       X.UI._ChromeBox,\r
+       X_Class.NONE,\r
+       XUI_ChromeBox,\r
        {\r
                Constructor : function(){\r
-                       X_Class_newPrivate( this, X.UI.Layout.Canvas, arguments );\r
+                       X_Class_newPrivate( this, XUI_Layout_Canvas, arguments );\r
                },\r
                add : function( node /* , node, node ... */ ){\r
                        X_Class_getPrivate( this ).containerNode.addAt( this.numNodes(), Array.prototype.slice.call( arguments ) );\r
@@ -50,7 +61,7 @@ X.UI.ChromeBox = X.UI.Box.inherits(
                        return this;\r
                },\r
                remove : function( node /* , node, node ... */ ){\r
-                       X_Class_getPrivate( this ).containerNode.remove( arguments );\r
+                       X_Class_getPrivate( this ).containerNode[ 'remove' ]( arguments );\r
                        return this;\r
                },\r
                removeAt : function( from, length ){\r