OSDN Git Service

Version 0.6.76, changed _rawNode to _rawObject.
[pettanr/clientJs.git] / 0.6.x / js / 01_dom / 22_XDomBuilder.js
index 548d735..bf6cd4e 100644 (file)
@@ -56,7 +56,7 @@ if( X.UA.MacIE ){
                                        parent.parentNode.insertBefore( clone, parent );\r
                                        parent.style.display = 'none';\r
                                        if( xnode ){\r
-                                               xnode.parent.parent._rawNode = clone;\r
+                                               xnode.parent.parent._rawObject = clone;\r
                                        };\r
                                } else {\r
                                        // ignore\r
@@ -109,7 +109,7 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
        X.Dom.DOM_W3C ?\r
 (function(){\r
        var r    = Node._body,\r
-               body = r._rawNode,\r
+               body = r._rawObject,\r
                copy, i, l, node, html,\r
                elmProgress;\r
        // TODO\r
@@ -206,7 +206,7 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
 X.Dom.DOM_IE4 ?\r
 (function(){\r
        var r    = Node._body,\r
-               body = r._rawNode,\r
+               body = r._rawObject,\r
                elmProgress = '_xdom_builder_progress',\r
                html;\r
 \r
@@ -350,25 +350,26 @@ X.Dom._bindElementToXnode =
                                        if( xnode._tag !== tag ){\r
                                                alert( '2:[' +parent._tag + '>' +xnode._tag + ' len:' + (xnode._xnodes ? xnode._xnodes.length : '' ) + '] !== ' + tag + ' ' + (elm.childNodes ? elm.childNodes.length : '' ) + '\n' + elm.outerHTML );\r
                                        } else {\r
-                                               xnode._rawNode = elm;\r
+                                               xnode._rawObject = elm;\r
                                                //if( ( doc = elm.ownerDocument || elm.document ) && ( doc.createElement( 'p' ).tagName === doc.createElement( 'P' ).tagName ) ){\r
                                                        if( tag.charAt( 0 ) === '/' ) tag = tag.slice( 1 );\r
                                                        xnode._tag = tag;\r
                                                //};\r
                                                xnode._root = parent._root;\r
                                                elm.UID     = xnode._uid;\r
+                                               current.xtext = null;\r
                                                \r
                                                if( tag === 'TEXTAREA' ){\r
                                                        xnode.attr( 'value', xnode.html() ).empty();\r
-                                                       current.xtext = null;\r
+                                                       \r
                                                } else\r
-                                               if( X.Dom._isCleanupTarget( elm ) ){// !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
+                                               //if( X.Dom._isCleanupTarget( elm ) ){// !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
                                                        //alert( '[' +parent._tag + '>' + xnode._tag + '] remove ... ' );\r
-                                                       xnode.destroy();\r
-                                               } else\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
+                                                       //current.xtext = null;\r
                                                        ++current.j;\r
                                                        \r
                                                        return {\r
@@ -383,6 +384,8 @@ X.Dom._bindElementToXnode =
                                                                skipCleanup : skipCleanup || X.Dom.skipCleanupTagNames[ tag ]\r
                                                        };\r
                                                };\r
+                                               // nochild\r
+                                               //current.xtext = null;\r
                                        };\r
                                        ++current.j;\r
                                        break;\r
@@ -402,7 +405,7 @@ X.Dom._bindElementToXnode =
                                };\r
                                \r
                                ++current.j;\r
-                               xnode._rawNode = elm;\r
+                               xnode._rawObject = elm;\r
                                xnode._text    = elm.data; // 正確\r
                                xnode._root    = parent._root;\r
                                if( !skipCleanup ){\r
@@ -483,7 +486,7 @@ X.Dom._bindElementToXnode =
                                } else {\r
                                        ++current.j;\r
                                        \r
-                                       xnode._rawNode = elm;\r
+                                       xnode._rawObject = elm;\r
                                        xnode._root    = parent._root;\r
                                        //xnode._tag     = X.Dom.DTD.TAG_FIX[ tag ] || tag;\r
                                        if( X.Dom._isCleanupTarget( elm ) ){ //!xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){\r
@@ -522,7 +525,7 @@ X.Dom._bindElementToXnode =
                                };\r
                        };\r
                        // for\r
-                       if( !xnode._rawNode ){\r
+                       if( !xnode._rawObject ){\r
                                alert( xnode._tag + ' ' + xnode._id + ' !== none...' );\r
                        };\r
                \r