Version 0.6.47, fix for IE5 & Opera7.x.

[pettanr/clientJs.git] / 0.6.x / js / dom / 22_XDomBuilder.js

diff --git a/0.6.x/js/dom/22_XDomBuilder.js b/0.6.x/js/dom/22_XDomBuilder.js
index 7e1257f..6061808 100644 (file)
--- a/0.6.x/js/dom/22_XDomBuilder.js
+++ b/0.6.x/js/dom/22_XDomBuilder.js
@@ -1,6 +1,22 @@
 \r
 X.Dom._useBuilder = true;\r
 \r
+X.Dom._isCleanupTarget = function( elm ){\r
+       var cname = ' ' + elm.className + ' ',\r
+               tag   = ( elm.tagName || '' ).toUpperCase();\r
+       return cname.indexOf( ' skip-cleanup ' ) === -1 &&\r
+               ( X.Dom.cleanupTagNames[ tag ] || 0 < cname.indexOf( ' cleanup-target ' ) );\r
+};\r
+\r
+X.Dom._o7_remove = function( node ){\r
+       var parent   = node.parentNode;\r
+       if( node.nodeType === 1 || node.nodeType === 3 ){\r
+               parent && parent.removeChild( node );\r
+       } else {\r
+               node.data = '';\r
+       };\r
+};\r
+\r
 /* --------------------------------------\r
  *  通常のwebページに対して使用する場合、dom ready で dom tree を写し取るために使う．\r
  *  完全にワンページアプリで<body/>が空な場合、このコードはビルドに含める必要はない\r
@@ -19,9 +35,9 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
                elmProgress;\r
        // TODO\r
        // textarea の内容を控えて、消す。xnode tree 構築後に復帰。でないと、html パースでこける\r
-       \r
+\r
        // cleanup tree \r
-       (function/*cleanUpTree*/( elm, skip, head ){\r
+       X.UA.MacIE || (function/*cleanUpTree*/( elm, skip, head ){\r
                var nodes      = X.copyArray( elm.childNodes ),\r
                        i          = 0,\r
                        l          = nodes.length,\r
@@ -47,7 +63,7 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
                                        break;\r
                                case 3 :\r
                                        content = skip ? node.data : X.Dom.cleanupWhiteSpace( node.data );\r
-                                       //console.log( 'Delete space ' + node.data.length + ' => ' + content.length );\r
+                                       //console.log( 'Delete space ' + node.data.length + ' => ' + content.length );                          \r
                                        if( !textNode && content !== ' ' && content.length ){\r
                                                node.data = content;\r
                                                textNode  = node;\r
@@ -59,12 +75,16 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
                                        // ブロック要素直下のスペースだけは削除？？\r
                                default :\r
                                        //console.log( 'Remove type: ' + node.nodeType + ' value: ' + node.nodeValue );\r
-                                       elm.removeChild( node );\r
+                                       if( !X.UA.Opera7 ){\r
+                                               elm.removeChild( node );\r
+                                       } else {\r
+                                               X.Dom._o7_remove( node );\r
+                                       };\r
                                        //++count;\r
                        };\r
                };\r
        })( body );\r
-       \r
+\r
        // body の属性値の取得\r
        html = body.innerHTML;\r
        \r
@@ -81,7 +101,8 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
                .listenOnce( X.Event.SUCCESS, function( e ){\r
                        var xnodes = Node.root._xnodes = [], t;\r
                        xnodes.push.apply( xnodes, e.xnodes );\r
-                       \r
+                       elmProgress.style.width = '100%';\r
+\r
                        X.Dom._asyncCreateTree( Node.root, body.childNodes, elmProgress );\r
                } );\r
 \r
@@ -113,6 +134,7 @@ X.Dom.DOM_IE4 ?
                        function( e ){\r
                                var xnodes = Node.root._xnodes = [], t;\r
                                xnodes.push.apply( xnodes, e.xnodes );\r
+                               elmProgress.style.width = '100%';\r
                                \r
                                X.Dom._asyncCreateTree( Node.root, body.childNodes || body.children, elmProgress );\r
                        }\r
@@ -139,6 +161,7 @@ X.Dom._asyncCreateTree = function ( parent, elems, elmProgress, async ){
                        flag   : 0\r
                },\r
                xnode, i, dive;\r
+       //alert( 'X.Dom._asyncCreateTree' );\r
        while( current || ( current = stack.pop() ) ){\r
                i = current.i;\r
                l = current.l;\r
@@ -169,6 +192,7 @@ X.Dom._asyncCreateTree = function ( parent, elems, elmProgress, async ){
                                                async.current = i < l && current;\r
                                                async.done    = done;\r
                                        };\r
+                                       //alert( 'koko?' );\r
                                        X.Timer.once( 0, X.Dom._asyncCreateTree, [ null, null, elmProgress, async || { stack : stack, current : i < l && current, done : done } ] );\r
                                        // progress\r
                                        elmProgress.style.width = ( ( 1 - done / Node._chashe.length ) * 100 | 0 ) + '%';\r
@@ -202,20 +226,29 @@ X.Dom._bindElementToXnode =
                                elm = elems[ current.j ];\r
                                tag = elm.tagName && elm.tagName.toUpperCase();\r
                                if( ( elm.nodeType !== 1 && elm.nodeType !== 3 ) || tag === '!' || ( tag && tag.charAt( 0 ) === '/' ) ){\r
-                                       elm.parentNode.removeChild( elm );\r
+                                       if( !X.UA.Opera7 ){\r
+                                               elm.parentNode.removeChild( elm );\r
+                                       } else {\r
+                                               X.Dom._o7_remove( elm );\r
+                                       };\r
                                        continue;\r
                                };\r
                \r
                                if( xnode._xnodeType === 1 ){\r
                                        if( elm.nodeType === 3 ){\r
-                                               //if( !( text = elm.data ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
-                                               //      elm.parentNode.removeChild( elm );\r
-                                               //      continue;\r
-                                               //};\r
-                                               alert( '[' +parent._tag + '>' +xnode._tag + '] !== ' + elm.nodeType + '\n' + elm.data );\r
+                                               if( !( text = elm.data ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+                                                       //alert( text.charCodeAt( 0 ) );\r
+                                                       if( !X.UA.Opera7 ){\r
+                                                               elm.parentNode.removeChild( elm );\r
+                                                       } else {\r
+                                                               X.Dom._o7_remove( elm );\r
+                                                       };\r
+                                                       continue;\r
+                                               };\r
+                                               alert( '1:[' +parent._tag + '>' +xnode._tag + '] !== ' + elm.nodeType + '\n' + ( elm.data ) );\r
                                        } else\r
                                        if( xnode._tag !== tag ){\r
-                                               alert( '[' +parent._tag + '>' +xnode._tag + ' ' + (xnode._xnodes ? xnode._xnodes.length : '' ) + '] !== ' + tag + ' ' + (elm.childNodes ? elm.childNodes.length : '' ) + '\n' + elm.outerHTML );\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
                                                //if( ( doc = elm.ownerDocument || elm.document ) && ( doc.createElement( 'p' ).tagName === doc.createElement( 'P' ).tagName ) ){\r