Version 0.6.124, remove xnode._root.

[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 533f6d9..3ba6c19 100644 (file)
--- a/0.6.x/js/02_dom/22_XTreeBuilder.js
+++ b/0.6.x/js/02_dom/22_XTreeBuilder.js
@@ -367,8 +367,8 @@ X_TEMP.bindElementToXnode =
                                                        if( tag.charAt( 0 ) === '/' ) tag = tag.slice( 1 );\r
                                                        xnode._tag = tag;\r
                                                //};\r
-                                               xnode._root   = parent._root;\r
-                                               xnode._flags &= X_Node_DIRTY_MASK_RESET;\r
+                                               xnode._flags |= X_Node_State.IN_TREE;\r
+                                               xnode._flags &= X_Node_BitMask_RESET_DIRTY;\r
                                                elm.UID       = xnode._uid;\r
                                                current.xtext = null;\r
                                                \r
@@ -376,10 +376,6 @@ X_TEMP.bindElementToXnode =
                                                        xnode.attr( 'value', xnode.html() ).empty();\r
                                                        \r
                                                } else\r
-                                               //if( X_TEMP._isCleanupTarget( elm ) ){// !xnode.hasClass( 'skip-cleanup' ) && ( X_Dom_DTD_CLEANUP_TAGS[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
-                                                       //alert( '[' +parent._tag + '>' + xnode._tag + '] remove ... ' );\r
-                                                       //xnode.destroy();\r
-                                               //} else\r
                                                if( elm.childNodes && elm.childNodes.length ){\r
                                                        //alert( '[' +parent._tag + '>' + xnode._tag + ' ' + (xnode._xnodes ? xnode._xnodes.length : '' ) + '] === ' + tag + ' ' + (elm.childNodes ? elm.childNodes.length : '' ) + ' Hit\n' + elm.outerHTML );\r
                                                        //current.xtext = null;\r
@@ -419,9 +415,10 @@ X_TEMP.bindElementToXnode =
                                \r
                                ++current.j;\r
                                xnode._rawObject = elm;\r
-                               xnode._flags    &= X_Node_DIRTY_MASK_RESET;\r
+                               xnode._flags    |= X_Node_State.IN_TREE;\r
+                               xnode._flags    &= X_Node_BitMask_RESET_DIRTY;\r
                                xnode._text      = elm.data; // 正確\r
-                               xnode._root      = parent._root;\r
+                               \r
                                if( !skipCleanup ){\r
                                        if( !( text = xnode._text ) || ( text = X_String_cleanupWhiteSpace( text ) ) === ' ' ){\r
                                                console.log( '[' +parent._tag + '>' + xnode._uid + '] destroy ... ' );\r
@@ -500,8 +497,8 @@ X_TEMP.bindElementToXnode =
                                        ++current.j;\r
                                        \r
                                        xnode._rawObject = elm;\r
-                                       xnode._flags    &= X_Node_DIRTY_MASK_RESET;\r
-                                       xnode._root      = parent._root;\r
+                                       xnode._flags    |= X_Node_State.IN_TREE;\r
+                                       xnode._flags    &= X_Node_BitMask_RESET_DIRTY;\r
                                        //xnode._tag     = X_Dom_DTD_TAG_FIX[ tag ] || tag;\r
                                        if( X_TEMP._isCleanupTarget( elm ) ){ //!xnode.hasClass( 'skip-cleanup' ) && ( X_Dom_DTD_CLEANUP_TAGS[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){\r
                                                xnode.destroy();\r