Version 0.6.121, iScroll5 is working on iPhone touch 1G, update X.Audio.

[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 06_AbstractUINode.js

diff --git a/0.6.x/js/20_ui/06_AbstractUINode.js b/0.6.x/js/20_ui/06_AbstractUINode.js
index f3b9c1f..14dea01 100644 (file)
--- a/0.6.x/js/20_ui/06_AbstractUINode.js
+++ b/0.6.x/js/20_ui/06_AbstractUINode.js
@@ -66,7 +66,7 @@ X.UI._AbstractUINode = X.EventDispatcher.inherits(
                        this.rootData   = rootData;\r
                        this.parent     = parent;\r
                        this.parentData = parentData;\r
-                       //this.xnode      = X.Node.create( 'div' );\r
+                       //this.xnode      = X_Doc_create( 'div' );\r
                        this.phase      = 1;\r
                        \r
                        this.dispatch( X.UI.Event.INIT );\r
@@ -144,7 +144,7 @@ X.UI._AbstractUINode = X.EventDispatcher.inherits(
                                if( v.indexOf( ' ' ) !== -1 ){\r
                                        v = v.split( ' ' );\r
                                } else\r
-                               if( color && X.Type.isNumber( _v = X.CSS.parseColor( v ) ) ){\r
+                               if( color && X.Type.isNumber( _v = X_Node_CSS_objToIEFilterText( v ) ) ){\r
                                        v = _v;\r
                                } else {\r
                                        // bad\r
@@ -890,6 +890,7 @@ X.UI.AbstractUINode = X.Class.create(
                                // setter\r
                                layout = p.parentData && p.parentData.layout.overrideAttrsForChild; // root には parent がない\r
                                for( k in nameOrObject ){\r
+                                       if( X_EMPTY_OBJECT[ k ] ) continue;\r
                                        // 親のレイアウトマネージャの許可しない\r
                                        if( layout && !layout[ k ] ){\r
                                                continue;\r