OSDN Git Service

Version 0.6.134, add comments for closure compiler.
[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 08_Box.js
index 8d07dfb..d98c944 100644 (file)
@@ -70,11 +70,11 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                                j = -1,\r
                                uinodes, arg, _data, attrs, support;\r
                        \r
-                       if( !this.User.instanceOf( X.UI.Box ) ){\r
+                       if( !this.User[ 'instanceOf' ]( X.UI.Box ) ){\r
                                //throw new Error( 'Box を継承したインスタンスだけが _Box のオーナーになれます' );\r
                        };                      \r
                        \r
-                       this.xnode  = X.Dom.Node.create( 'div' );\r
+                       this.xnode  = X_Doc_create( 'div' );\r
                        \r
                        // すでに定義されていればそちらを採用\r
                        // supportAttrs や attrClass が、layout を元に上書きされているため\r
@@ -82,20 +82,23 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                        \r
                        for( ; i < l; ++i ){\r
                                arg = args[ i ];\r
-                               if( arg.instanceOf && arg.instanceOf( X.UI.AbstractUINode ) ){\r
-                                       _data = X.Class._getPrivate( arg );\r
+                               if( arg[ 'instanceOf' ] && arg[ 'instanceOf' ]( X.UI.AbstractUINode ) ){\r
+                                       _data = X_Class_getPrivate( arg );\r
                                        if( !uinodes ) this.uinodes = uinodes = [];\r
                                        uinodes[ ++j ] = _data;\r
                                        if( _data.parent ){\r
                                                //throw new Error( 'インスタンスはすでに親に追加されています ' + arg );\r
                                        };\r
                                } else\r
-                               if( arg.instanceOf && arg.instanceOf( X.UI.Layout.Base ) ){\r
+                               if( arg[ 'instanceOf' ] && arg[ 'instanceOf' ]( Node ) ){\r
                                        //this.layout = arg;\r
                                } else\r
-                               if( X.Type.isObject( arg ) ){\r
+                               if( arg[ 'instanceOf' ] && arg[ 'instanceOf' ]( X.UI.Layout.Base ) ){\r
+                                       //this.layout = arg;\r
+                               } else\r
+                               if( X_Type_isObject( arg ) ){\r
                                        if( attrs ){\r
-                                               attrs = X.Class._override( attrs, arg );\r
+                                               attrs = X_Class_override( attrs, arg );\r
                                        } else {\r
                                                attrs = arg;\r
                                        };\r
@@ -105,6 +108,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                        };\r
                        \r
                        for( p in attrs ){\r
+                               if( X_EMPTY_OBJECT[ p ] ) continue;\r
                                ( support = this.supportAttrs[ p ] ) && this.setAttr( p, support, attrs[ p ] );\r
                        };\r
                },\r
@@ -116,7 +120,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                        this.rootData   = rootData;\r
                        this.parent     = parent;\r
                        this.parentData = parentData;\r
-                       //this.xnode      = X.Dom.Node.create( 'div' );\r
+                       //this.xnode      = X_Doc_create( 'div' );\r
                        \r
                        if( i ){\r
                                for( ; i; ){\r
@@ -125,7 +129,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                        };\r
                        \r
                        this.phase = 1;\r
-                       this.User.dispatch( { type : X.UI.Event.INIT } );\r
+                       this.User[ 'dispatch' ]( { type : X.UI.Event.INIT } );\r
                },\r
                \r
                addToParent : function( parentXNode ){\r
@@ -133,7 +137,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                                l       = uinodes && uinodes.length,\r
                                i;\r
 \r
-                       parentXNode && parentXNode.append( this.xnode );\r
+                       parentXNode && parentXNode[ 'append' ]( this.xnode );\r
                        \r
                        if( l ){\r
                                for( i = 0; i < l; ++i ){\r
@@ -142,7 +146,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                        };\r
                        \r
                        this.phase = 2;\r
-                       this.User.dispatch( { type : X.UI.Event.ADDED } );\r
+                       this.User[ 'dispatch' ]( { type : X.UI.Event.ADDED } );\r
                },\r
                \r
        /* Rellay */\r
@@ -205,13 +209,13 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
 \r
                        //console.log( '### AddAt ' + this.phase )\r
                        for( l = _uinodes.length; i < l; ++i ){\r
-                               data = X.Class._getPrivate( _uinodes[ i ] );\r
+                               data = X_Class_getPrivate( _uinodes[ i ] );\r
                                _p1  = p1 && data.phase < 1;\r
                                _p2  = p2 && data.phase < 2;\r
                                _p1 && data.initialize( this.root, this.rootData, this.User, this );\r
                                if( index <= num ){\r
                                        // _p2 && this.xnode.insertBefore( data.xnode, uinodes[ index + i ].xnode );\r
-                                       _p2 && uinodes[ index + i ].xnode.before( data.xnode );\r
+                                       _p2 && uinodes[ index + i ].xnode[ 'prev' ]( data.xnode );\r
                                        _p2 && data.addToParent( this.xnode );\r
                                        uinodes.splice( index + i, 0, data );\r
                                } else {\r
@@ -231,7 +235,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
 \r
                        //console.log( '### AddAt ' + this.phase )\r
                        for( ; i; ){\r
-                               data = X.Class._getPrivate( _uinodes[ --i ] );\r
+                               data = X_Class_getPrivate( _uinodes[ --i ] );\r
                                if( ( n = uinodes.indexOf( data ) ) !== -1 ){\r
                                        uinodes.splice( n, 1 );\r
                                        data._remove();\r
@@ -243,7 +247,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                removeAt : function( from, length ){\r
                        var uinodes = this.uinodes,\r
                                i       = uinodes.length,\r
-                               to      = from + ( X.Type.isNumber( length ) && 1 <= length ? length : 1 ),\r
+                               to      = from + ( X_Type_isNumber( length ) && 1 <= length ? length : 1 ),\r
                                node;\r
                        for( ; i; ){\r
                                node = uinodes[ --i ];\r
@@ -264,7 +268,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
                                case 4:\r
                                case 3:\r
                                case 2:\r
-                                       this.xnode.remove();\r
+                                       this.xnode[ 'remove' ]();\r
                                case 1:\r
                                        delete this.root;\r
                                        delete this.rootData;\r
@@ -283,34 +287,34 @@ X.UI.Box = X.UI.AbstractUINode.inherits(
        X.UI._Box,\r
        {\r
                Constructor : function(){\r
-                       X.Class._newPrivate( this, X.UI.Layout.Canvas, arguments );\r
+                       X_Class_newPrivate( this, X.UI.Layout.Canvas, arguments );\r
                },\r
                \r
                add : function( node /* , node, node ... */ ){\r
-                       X.Class._getPrivate( this ).addAt( this.numNodes() + 1, Array.prototype.slice.call( arguments ) );\r
+                       X_Class_getPrivate( this ).addAt( this.numNodes() + 1, Array.prototype.slice.call( arguments ) );\r
                        return this;\r
                },\r
                addAt : function( index, node /* , node, node ... */ ){\r
                        if( index < 0 ) index = 0;\r
-                       X.Class._getPrivate( this ).addAt( arguments[ 0 ], Array.prototype.slice.call( arguments, 1 ) );\r
+                       X_Class_getPrivate( this ).addAt( arguments[ 0 ], Array.prototype.slice.call( arguments, 1 ) );\r
                        return this;\r
                },\r
                remove : function( node /* , node, node ... */ ){\r
-                       X.Class._getPrivate( this ).remove( Array.prototype.slice.call( arguments ) );\r
+                       X_Class_getPrivate( this )[ 'remove' ]( Array.prototype.slice.call( arguments ) );\r
                        return this;\r
                },\r
                removeAt : function( from, length ){\r
-                       X.Class._getPrivate( this ).removeAt( from, length );\r
+                       X_Class_getPrivate( this ).removeAt( from, length );\r
                        return this;\r
                },\r
                getNodesByClass : function( klass ){\r
                        var ret     = [],\r
-                               uinodes = X.Class._getPrivate( this ).uinodes,\r
+                               uinodes = X_Class_getPrivate( this ).uinodes,\r
                                i, l, node;\r
                        if( !uinodes || uinodes.length === 0 ) return ret;\r
                        for( i = 0, l = uinodes.length; i < l; ++i ){\r
                                node = uinodes[ i ].User;\r
-                               if( node.instanceOf( klass ) ) ret[ ret.length ] = node;\r
+                               if( node[ 'instanceOf' ]( klass ) ) ret[ ret.length ] = node;\r
                        };\r
                        return ret;\r
                },\r
@@ -318,16 +322,16 @@ X.UI.Box = X.UI.AbstractUINode.inherits(
                        return this.getNodeAt( 0 );\r
                },\r
                getLastChild : function(){\r
-                       var uinodes = X.Class._getPrivate( this ).uinodes;\r
+                       var uinodes = X_Class_getPrivate( this ).uinodes;\r
                        return uinodes && uinodes.length && uinodes[ uinodes.length - 1 ].User || null;\r
                },\r
                getNodeAt : function( index ){\r
                        if( index < 0 ) return null;\r
-                       var uinodes = X.Class._getPrivate( this ).uinodes;\r
+                       var uinodes = X_Class_getPrivate( this ).uinodes;\r
                        return uinodes && uinodes[ index ].User || null;\r
                },\r
                numNodes : function(){\r
-                       var uinodes = X.Class._getPrivate( this ).uinodes;\r
+                       var uinodes = X_Class_getPrivate( this ).uinodes;\r
                        return uinodes && uinodes.length || 0;\r
                }\r
        }\r
@@ -341,7 +345,7 @@ X.UI.Box.presets = function(){
        var args   = arguments,\r
                i      = 0,\r
                l      = args.length,   \r
-               shadow = X.Class._getClassDef( this ).privateClass,\r
+               shadow = X_Class_getClassDef( this ).privateClass,\r
                layout = shadow.prototype.layout,\r
                arg, attrs, supports, klass, klassDef, privateKlass, boxName;\r
                        \r
@@ -349,21 +353,21 @@ X.UI.Box.presets = function(){
                arg = args[ i ];\r
                if( !arg ) continue;\r
                // レイアウトの preset ができるのは layout が未定義な Box だけ\r
-               if( !shadow.prototype.layout && arg.instanceOf && arg.instanceOf( X.UI.Layout.Base ) ){\r
+               if( !shadow.prototype.layout && arg[ 'instanceOf' ] && arg[ 'instanceOf' ]( X.UI.Layout.Base ) ){\r
                        layout = arg;\r
                } else\r
-               if( ( klassDef = X.Class._getClassDef( arg ) ) && klassDef.isPrivate ){\r
+               if( ( klassDef = X_Class_getClassDef( arg ) ) && klassDef.isPrivate ){\r
                        privateKlass = arg;\r
                        layout = privateKlass.prototype.layout;\r
                } else\r
-               if( X.Type.isObject( arg ) ){\r
+               if( X_Type_isObject( arg ) ){\r
                        if( attrs ){\r
-                               X.Class._override( attrs, arg, true );\r
+                               X_Class_override( attrs, arg, true );\r
                        } else {\r
                                attrs = arg;\r
                        };\r
                } else\r
-               if( X.Type.isString( arg ) ){\r
+               if( X_Type_isString( arg ) ){\r
                        boxName = arg;\r
                };\r
        };\r