Version 0.6.133, fix for closure compiler - ADVANCED_OPTIMIZATIONS

[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..78aab37 100644 (file)
--- a/0.6.x/js/02_dom/22_XTreeBuilder.js
+++ b/0.6.x/js/02_dom/22_XTreeBuilder.js
@@ -8,7 +8,7 @@ X_TEMP._isCleanupTarget = function( elm ){
                ( X_Dom_DTD_CLEANUP_TAGS[ tag ] || cname.indexOf( ' cleanup-target ' ) !== -1 );\r
 };\r
 \r
-if( X_UA.MacIE ){\r
+if( X_UA[ 'MacIE' ] ){\r
 \r
        X_TEMP._fixed_remove = function( node, xnode ){\r
                var parent   = node.parentNode, l;\r
@@ -86,7 +86,7 @@ if( X_UA.MacIE ){
        };\r
        \r
 } else\r
-if( X_UA.Opera7 ){\r
+if( X_UA[ 'Opera7' ] ){\r
 \r
        X_TEMP._fixed_remove = function( node ){\r
                if( node.nodeType === 1 || node.nodeType === 3 ){\r
@@ -119,7 +119,7 @@ X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT,
        \r
        // TODO\r
        // textarea の内容を控えて、消す。xnode tree 構築後に復帰。でないと、html パースでこける\r
-       //X_UA.MacIE && alert( body.innerHTML );\r
+       //X_UA[ 'MacIE' ] && alert( body.innerHTML );\r
        // cleanup tree \r
        (function/*cleanUpTree*/( elm, skip, head ){\r
                var nodes      = X_Object_cloneArray( elm.childNodes ),\r
@@ -159,7 +159,7 @@ X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT,
                                        // ブロック要素直下のスペースだけは削除？？\r
                                default :\r
                                        //console.log( 'Remove type: ' + node.nodeType + ' value: ' + node.nodeValue );\r
-                                       if( !X_UA.Opera7 /*&& !X_UA.MacIE */ ){\r
+                                       if( !X_UA[ 'Opera7' ] /*&& !X_UA[ 'MacIE' ] */ ){\r
                                                elm.removeChild( node );\r
                                        } else {\r
                                                X_TEMP._fixed_remove( node );\r
@@ -167,13 +167,13 @@ X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT,
                                        //++count;\r
                        };\r
                };\r
-       })( X_UA.MacIE ? ( copy = body.cloneNode( true ) ) : body );\r
+       })( X_UA[ 'MacIE' ] ? ( copy = body.cloneNode( true ) ) : body );\r
 \r
-       if( X_UA.MacIE ){\r
+       if( X_UA[ 'MacIE' ] ){\r
                document.write( html = copy.innerHTML );\r
        } else {\r
                // body の属性値の取得\r
-               if( X_UA.IE5678 ){\r
+               if( X_UA[ 'IE' ] <= 8 ){\r
                        html = body.innerHTML.split( X_String_CRLF ).join( '' ); // 不要な改行が入る\r
                } else {\r
                        html = body.innerHTML;\r
@@ -194,12 +194,12 @@ X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT,
        elmProgress.setAttribute( 'style', 'position:absolute;top:0;left:0;z-index:9999;width:0;height:0.5em;background:#00f;overflow:hidden;' );\r
        \r
        X_HTMLParser_asyncParse( html, true )\r
-               .listen( X.Event.PROGRESS,\r
+               .listen( X_Event.PROGRESS,\r
                        function(e){\r
                                elmProgress.style.width = ( e.percent * 100 | 0 ) + '%';\r
                        }\r
                )\r
-               .listenOnce( X.Event.SUCCESS, function( e ){\r
+               .listenOnce( X_Event.SUCCESS, function( e ){\r
                        var xnodes = X_Node_body._xnodes = [], t;\r
                        xnodes.push.apply( xnodes, e.xnodes );\r
                        elmProgress.style.width = '100%';\r
@@ -229,12 +229,12 @@ X_UA_DOM.IE4 ?
        elmProgress = document.all[ elmProgress ];\r
        \r
        X_HTMLParser_asyncParse( html, true )\r
-               .listen( X.Event.PROGRESS,\r
+               .listen( X_Event.PROGRESS,\r
                        function( e ){\r
                                elmProgress.style.width = ( e.percent * 100 | 0 ) + '%';\r
                        }\r
                )\r
-               .listenOnce( X.Event.SUCCESS,\r
+               .listenOnce( X_Event.SUCCESS,\r
                        function( e ){\r
                                var xnodes = X_Node_body._xnodes = [], t;\r
                                xnodes.push.apply( xnodes, e.xnodes );\r
@@ -334,7 +334,7 @@ X_TEMP.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
-                                       if( !X_UA.Opera7 && !X_UA.MacIE ){\r
+                                       if( !X_UA[ 'Opera7' ] && !X_UA[ 'MacIE' ] ){\r
                                                elm.parentNode.removeChild( elm );\r
                                        } else {\r
                                                X_TEMP._fixed_remove( elm );\r
@@ -346,7 +346,7 @@ X_TEMP.bindElementToXnode =
                                        if( elm.nodeType === 3 ){\r
                                                if( !( text = elm.data ) || ( text = X_String_cleanupWhiteSpace( text ) ) === ' ' ){\r
                                                        //alert( text.charCodeAt( 0 ) );\r
-                                                       if( !X_UA.Opera7 && !X_UA.MacIE ){\r
+                                                       if( !X_UA[ 'Opera7' ] && !X_UA[ 'MacIE' ] ){\r
                                                                elm.parentNode.removeChild( elm );\r
                                                        } else {\r
                                                                X_TEMP._fixed_remove( elm );\r
@@ -407,8 +407,8 @@ X_TEMP.bindElementToXnode =
                                                break;\r
                                        };\r
                                        alert(  parent._tag + ' > ' + '"' + xnode._text + '" !== ' + tag + '\n' +\r
-                                               'prev : ' + ( xnode.prevNode() && xnode.prevNode().html() ) + '\n' +\r
-                                               'next : ' + ( xnode.nextNode() && xnode.nextNode().html() ) + '\n' +\r
+                                               'prev : ' + ( xnode.prev() && xnode.prev().html() ) + '\n' +\r
+                                               'next : ' + ( xnode.next() && xnode.next().html() ) + '\n' +\r
                                                'html : ' + elm.outerHTML );\r
                                        break;\r
                                };\r
@@ -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