X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=0.6.x%2Fjs%2F20_ui%2F02_XUI_Attr.js;h=e29227f1cda495736fa041c007ad046d47240237;hb=572e81e88d5e6f8e3c5d73df7c95e61f1c4544e0;hp=ae31c1e86f11b58f9bb724da6eb6bb22f7fd357d;hpb=51e22031f9629d4bc32444a0228930642144ee9e;p=pettanr%2FclientJs.git diff --git a/0.6.x/js/20_ui/02_XUI_Attr.js b/0.6.x/js/20_ui/02_XUI_Attr.js index ae31c1e..e29227f 100644 --- a/0.6.x/js/20_ui/02_XUI_Attr.js +++ b/0.6.x/js/20_ui/02_XUI_Attr.js @@ -1,5 +1,5 @@ X.UI.Attr = { - AUTO : Number.POSITIVE_INFINITY, + AUTO : 1/0,//Number.POSITIVE_INFINITY, FLOOR : new Function( 'v', 'return 0 <= v ? v | 0 : -( -v | 0 )' ), USER : { @@ -37,13 +37,14 @@ X.UI.Attr = { }, createAttrDef : function( base, defs ){ - var F = base ? X.cloneObject( base ) : {}, + var F = base ? X_Object_clone( base ) : {}, z = base ? base._last : 0, n = 1, p, def; // 属性定義の上書き for( p in defs ){ + if( X_EMPTY_OBJECT[ p ] ) continue; if( p === '_last' ) continue; if( !X.Type.isArray( def = defs[ p ] ) ) continue; F[ p ] = def; @@ -153,6 +154,7 @@ X.UI.Attr.copy = function( proto, supports ){ var support, p; for( p in supports ){ + if( X_EMPTY_OBJECT[ p ] ) continue; if( p === '_last' ) continue; support = supports[ p ]; proto[ support.No ] = support[ 0 ]; @@ -180,6 +182,7 @@ X.UI.Attr.preset = function( baseKlass, opt_supports, opt_attrs ){ // setAttr に書き換え X.UI.attrClassProto = proto; for( p in opt_attrs ){ + if( X_EMPTY_OBJECT[ p ] ) continue; opt_supports[ p ] && X.UI._AbstractUINode.prototype.setAttr( p, opt_supports[ p ], opt_attrs[ p ] ); }; X.UI.attrClassProto = null;