X.Node working on IE5-, bugfix X.Node.Anime.

[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 22_XTreeBuilder.js

diff --git a/0.6.x/js/02_dom/22_XTreeBuilder.js b/0.6.x/js/02_dom/22_XTreeBuilder.js
index 3ba6c19..063ada6 100644 (file)
--- a/0.6.x/js/02_dom/22_XTreeBuilder.js
+++ b/0.6.x/js/02_dom/22_XTreeBuilder.js
@@ -453,10 +453,13 @@ X_TEMP.bindElementToXnode =
                        xnode.parent = parent;\r
                        \r
                        if( !xnode._tag ){\r
+                               xnode._flags |= X_Node_State.IN_TREE;\r
+                               xnode._flags &= X_Node_BitMask_RESET_DIRTY;\r
                                //alert( X_String_cleanupWhiteSpace( xnode._text ) );\r
                                if( !skipCleanup ){\r
                                        if( !( text = xnode._text ) || ( text = X_String_cleanupWhiteSpace( text ) ) === ' ' ){\r
                                                xnode.destroy();\r
+                                               xnode = null;\r
                                        } else\r
                                        if( xtext ){\r
                                                //alert( 'xtext ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
@@ -466,18 +469,15 @@ X_TEMP.bindElementToXnode =
                                                //alert( 'xnode ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
                                                xnode.text( text );\r
                                        };\r
-                               } else\r
-                               if( xtext ){\r
-                                       //alert( 'skip ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
-                                       xtext.text( xtext._text + xnode._text );\r
-                                       xnode.destroy();\r
+                               } else {\r
+                                       if( xtext ){\r
+                                               //alert( 'skip ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
+                                               xtext.text( xtext._text + xnode._text );\r
+                                               xnode.destroy();\r
+                                       };\r
                                };\r
-                               current.flag |= 4;\r
                                current.xtext = xtext || xnode;\r
-                               return;\r
-                       };\r
-                       \r
-                       if( !xnode._tag ){\r
+                               parent._flags |= X_Node_State.IE4_HAS_TEXTNODE;\r
                                return;\r
                        };\r
                        \r
@@ -513,7 +513,7 @@ X_TEMP.bindElementToXnode =
                                                        ( xnode._attrs = { type : 'text' } ) :\r
                                                        xnode._attrs.type || ( xnode._attrs.type = 'text' )\r
                                        );\r
-                                       current.flag |= 3;\r
+                                       parent._flags |= X_Node_State.IE4_HAS_ELEMENT;\r
                                        current.xtext = null;\r
                                        \r
                                        if( tag === 'TEXTAREA' ){\r
@@ -539,9 +539,6 @@ X_TEMP.bindElementToXnode =
                        if( !xnode._rawObject ){\r
                                alert( xnode._tag + ' ' + xnode._id + ' !== none...' );\r
                        };\r
-               \r
-                       // textNode がある\r
-                       ( current.flag & 6 ) && ( parent._flags |= X_Node_State.IE4_TEXTNODE_FIX );\r
                });\r
 \r
 console.log( 'X.Dom.Builder' );\r