OSDN Git Service

Version 0.6.57, fixed NS of X.UI & X.Class for __proto__.
[pettanr/clientJs.git] / 0.6.x / js / dom / 11_XDomNode.js
index 589db76..bc48a70 100644 (file)
@@ -1,4 +1,3 @@
-\r
 X.Dom.Dirty = {\r
        CLEAN            :  0,\r
        CHILD_IS_DIRTY   :  1,\r
@@ -7,13 +6,11 @@ X.Dom.Dirty = {
        CLASSNAME        :  8, // _getCharSize, width, height, x, y\r
        ATTR             : 16, // _getCharSize, width, height, x, y\r
        CSS              : 32, // _getCharSize, width, height, x, y\r
-       IE_FILTER        : X.UA.IE && X.UA.IE < 9 ? 64 : 0,\r
+       IE_FILTER        : X.UA.IE && X.UA.IE < 9 && !X.UA.MacIE ? 64 : 0,\r
        UNKNOWN_TAG_FIX  : 128,\r
        IE4_TEXTNODE_FIX : 256\r
 };\r
 \r
-ie55 = 7;\r
-\r
 X.Dom.State = {\r
        DESTROYED          : 0,\r
        EXIST              : 1,\r
@@ -28,13 +25,17 @@ X.Dom.State = {
        HAS_HEIGHT_LENGTH  : 512,\r
        HAS_HEIGHT_PERCENT : 1024,\r
        IE4_ONLY_TEXT      : 2048,\r
-       IE5_DISPLAY_NONE_FIX : 5 <= X.UA.IE && X.UA.IE < ie55 ? 4096 : 0\r
+       IE5_DISPLAY_NONE_FIX : !X.UA.MacIE && 5 <= X.UA.IE && X.UA.IE < 5.5 ? 4096 : 0 // filterがかかっていると不可? MacIE5.2- は ?\r
 };\r
 \r
+X.Dom._strictElmCreation = !X.UA.MacIE && X.UA.IE5678;// && !X.UA.MacIE;\r
+\r
+X.Dom._useDocumentFragment = document.createDocumentFragment && ( !X.UA.IE || 5.5 <= X.UA.IE ) && document.createDocumentFragment();\r
+\r
 /*\r
  * Node( rawElement | rawTextnode | htmlString | textString )\r
  */\r
-//;(function( window, document, undeifned ){\r
+\r
 X.Dom.Node = X.EventDispatcher.inherits(\r
        'XDomNode',\r
        X.Class.POOL_OBJECT,\r
@@ -58,11 +59,13 @@ X.Dom.Node = X.EventDispatcher.inherits(
 \r
                _attrs     : null, // X.Dom.Attr\r
                _newAttrs  : null,\r
-               _attrText  : '',\r
+               _attrText  : '', // X.Dom.Attr.objToAttrText が必要な場合は false が入っている\r
                \r
                _css       : null, // X.Dom.Style\r
                _cssText   : null,\r
                \r
+               _fontSize  : 0,\r
+               \r
                _anime     : null,\r
                \r
                Constructor : function( v ){\r
@@ -70,11 +73,11 @@ X.Dom.Node = X.EventDispatcher.inherits(
                        \r
                        if( Node._newByTag ){\r
                                Node._newByTag  = false;\r
-                               this._tag       = v;\r
+                               this._tag       = v.toUpperCase();\r
                                this._xnodeType = 1;\r
                                this._state     = X.Dom.State.DISPLAY_INLINE; // todo\r
                                arguments[ 1 ] && this.attr( arguments[ 1 ] );\r
-                               css = arguments[ 2 ];\r
+                               css = arguments[ 2 ] || arguments[ 1 ];\r
                                css && this[ X.Type.isString( css ) ? 'cssText' : 'css' ]( css );\r
                        } else\r
                        if( Node._newByText ){\r
@@ -99,14 +102,14 @@ X.Dom.Node = X.EventDispatcher.inherits(
                                                this._rawNode   = v;\r
                                                this._xnodeType = 1;\r
                                                this._state     = X.Dom.State.DISPLAY_BLOCK; // todo\r
-                                               this._tag       = v.tagName;\r
+                                               this._tag       = v.tagName.toUpperCase();\r
                                                this._id        = v.id;\r
                                                this._className = v.className;\r
                                                this.cssText( v.style.cssText );\r
                                                // X.Dom.Dirty.CSS を落とす\r
                                                this._dirty = 0;\r
                                                // attr の回収は不可能、、、\r
-                                               if( X.UA.IE && X.UA.IE < 5 ){\r
+                                               if( X.Dom.DOM_IE4 ){\r
                                                        v.setAttribute( 'UID', '' + uid );\r
                                                } else {\r
                                                        v.UID = uid;\r
@@ -129,9 +132,15 @@ X.Dom.Node = X.EventDispatcher.inherits(
                                                if( xnodes.length ) return xnodes[ 0 ];\r
                                                return Node.none;\r
                                        case Node.IS_IMAGE :\r
-                                               v.UID = uid;\r
+                                               if( xnode = Node._getXNode( v ) ) return xnode;\r
+                                               this._rawNode   = v;\r
+                                               this._xnodeType = 4;\r
+                                               v.UID           = uid;\r
+                                               this._state     = X.Dom.State.EXIST;\r
+                                               break;\r
                                        case Node.IS_WINDOW :\r
                                        case Node.IS_DOCUMENT :\r
+                                               if( xnode = Node._getXNode( v ) ) return xnode;\r
                                                this._rawNode   = v;\r
                                                this._xnodeType = 2;\r
                                                this._state     = X.Dom.State.DISPLAY_BLOCK;\r
@@ -160,14 +169,17 @@ Node.IS_WINDOW      = 8;
 Node.IS_DOCUMENT    = 9;\r
 Node.IS_IMAGE       = 10;\r
 \r
-Node._useDocumentFragment = document.createDocumentFragment && ( !X.UA.IE || 6 <= X.UA.IE ) && document.createDocumentFragment();\r
-\r
 Node._getType = function( v ){\r
        if( v === '' ) return Node.IS_STRING;\r
        if( !v ) return 0;\r
        if( v === window ) return Node.IS_WINDOW;\r
        if( v === document ) return Node.IS_DOCUMENT;\r
        if( v.constructor === window.Image ) return Node.IS_IMAGE;\r
+       if( X.UA.Safari && X.UA.Safari < 3 ){\r
+               if( v.src !== undefined && v.onload !== undefined && X.Type.isNumber( v.height ) && X.Type.isNumber( v.width ) && X.Type.isBoolean( v.complete ) ){\r
+                       return Node.IS_IMAGE;\r
+               };\r
+       };      \r
        if( v.constructor === Node ) return Node.IS_XNODE;\r
        if( v.constructor === X.Dom.NodeList ) return Node.IS_XNODE_LIST;\r
        if( v.tagName ) return Node.IS_RAW_HTML;\r
@@ -187,7 +199,7 @@ Node._getXNode = function( v ){
                case Node.IS_RAW_HTML :\r
                case Node.IS_IMAGE :\r
                        // fake TextNode too.\r
-                       if( X.UA.IE && X.UA.IE < 5 ){\r
+                       if( X.Dom.DOM_IE4 ){\r
                                uid = v.getAttribute( 'UID' );\r
                                return uid && Node._chashe[ uid ];\r
                        };\r
@@ -197,6 +209,7 @@ Node._getXNode = function( v ){
                case Node.IS_DOCUMENT :\r
                        return Node._document;\r
                case Node.IS_RAW_TEXT :\r
+                       if( v.UID ) return Node._chashe[ v.UID ];\r
                        for( chashe = Node._chashe, i = chashe.length; i; ){\r
                                if( ( xnode = Node._chashe[ --i ] ) && ( xnode._rawNode === v ) ) return xnode;\r
                        };\r
@@ -226,14 +239,15 @@ Node.createText = function( text ){
 \r
 Node.getRoot = function( xnode ){\r
        return Node._document;\r
-       //return xnode.root._rawNode.documentElement ? node : node.ownerDocument || node.document;\r
+       //return xNode._body._rawNode.documentElement ? node : node.ownerDocument || node.document;\r
 };\r
        // XMLかどうかを判別する\r
 Node.isXmlDocument =\r
-       X.UA.IE && X.UA.IE < 5 ?\r
+       X.Dom.DOM_IE4 ?\r
                X.emptyFunction :\r
                (function( root ){\r
-                       return root._rawNode.createElement( 'p' ).tagName !== root._rawNode.createElement( 'P' ).tagName;\r
+                       if( X.Type.isBoolean( root.isXML ) ) return root.isXML;\r
+                       return root.isXML = root._rawNode.createElement( 'p' ).tagName !== root._rawNode.createElement( 'P' ).tagName;\r
                });\r
 \r
 Node._chashe     = [];\r
@@ -241,12 +255,12 @@ Node.none        = Node._chashe[ 0 ] = new Node();
 Node._window     = new Node( window ); // Node._chashe[ 1 ]\r
 Node._document   = new Node( document ); // Node._chashe[ 2 ]\r
 Node._html       = null; // Node._chashe[ 3 ]\r
-Node.root        = null;// = Node._chashe[ 4 ] body\r
+Node._body       = null;// = Node._chashe[ 4 ] body\r
 Node._systemNode = null;// = Node._chashe[ ? ]\r
 \r
 Node._reserveRemoval = [];\r
 \r
-if( !document.getElementById && document.all ){\r
+if( X.Dom.DOM_IE4 ){\r
        Node.prototype._ie4getRawNode = function(){\r
                var elm = this._rawNode;\r
                return elm ||\r
@@ -349,10 +363,10 @@ Node.prototype.append = function( v ){
                        if( v._xnodeType !== 1 && v._xnodeType !== 3 ) return this;\r
                        // 親の xnodes から v を消す\r
                        if( v.parent ){\r
-                               //if( document.getElementById ){\r
+                               //if( X.Dom.DOM_W3C ){\r
                                //      v.parent._xnodes.splice( v.parent._xnodes.indexOf( v ), 1 );\r
                                //} else\r
-                               //if( document.all ){\r
+                               //if( X.Dom.DOM_IE4 ){\r
                                        v.remove();\r
                                //} else {\r
                                        \r
@@ -413,10 +427,10 @@ Node.prototype.appendAt = function( start, v ){
                        if( v._xnodeType !== 1 && v._xnodeType !== 3 ) return this;\r
                        // 親の xnodes から v を消す\r
                        if( v.parent ){\r
-                               //if( document.getElementById ){\r
+                               //if( X.Dom.DOM_W3C ){\r
                                //      v.parent._xnodes.splice( v.parent._xnodes.indexOf( v ), 1 );\r
                                //} else\r
-                               //if( document.all ){\r
+                               //if( X.Dom.DOM_IE4 ){\r
                                        v.remove();\r
                                //} else {\r
                                        \r
@@ -455,7 +469,7 @@ Node.prototype.appendTo = function( parent, opt_index ){
 };\r
 \r
 Node.prototype.appendToRoot = function( opt_index ){\r
-       opt_index === undefined ? Node.root.append( this ) : Node.root.appendAt( opt_index, this );\r
+       opt_index === undefined ? Node._body.append( this ) : Node._body.appendAt( opt_index, this );\r
        return this;\r
 };\r
 \r
@@ -739,7 +753,7 @@ Node.prototype.html = function( html ){
                '<', this._tag,\r
                this._id ? ' id="' + this._id + q : _,\r
                this._className ? ' class="' + this._className + q : _,\r
-               this._attrText || ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ),\r
+               this._attrText === false ? ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ) : this._attrText,\r
                this._cssText ? ' style="' + this._cssText + q : _,\r
        '>' ];\r
        \r
@@ -752,7 +766,7 @@ Node.prototype.html = function( html ){
                };\r
                if( Node._outerFlag === this )  Node._outerFlag = null;\r
        };\r
-       !Node._outerFlag || X.Dom.DTD.EMPTY[ this._tag.toLowerCase() ] || ( html[ n ] = '<\/' + this._tag + '>' );\r
+       !Node._outerFlag || X.Dom.DTD.EMPTY[ this._tag ] || ( html[ n ] = '<\/' + this._tag + '>' );\r
        return html.join( _ );\r
 };\r
 \r
@@ -807,7 +821,7 @@ Node.prototype.each = function( func ){
  */\r
        \r
 Node.prototype._reserveUpdate = function(){\r
-       var root = Node.root;\r
+       var root = Node._body;\r
        if( root && !root._updateTimerID ) root._updateTimerID = X.Timer.requestFrame( root, root._startUpdate );\r
 };\r
 \r
@@ -822,31 +836,37 @@ Node.prototype._startUpdate = function(){
        } else {\r
                return;\r
        };\r
-\r
-       X.Dom._listeners && X.Dom._listeners[ X.Dom.Event.BEFORE_UPDATE ] && X.Dom.dispatch( { type : X.Dom.Event.BEFORE_UPDATE } );\r
+       // このイベントでサイズを取ると無限ループに\r
+       // X.Dom._listeners && X.Dom._listeners[ X.Dom.Event.BEFORE_UPDATE ] && X.Dom.dispatch( { type : X.Dom.Event.BEFORE_UPDATE } );\r
 \r
        removal = Node._reserveRemoval;\r
        \r
        tmp = this._rawNode.style.visibility;\r
        //this._rawNode.style.visibility = 'hidden';\r
-       \r
+\r
+       //console.log( '_actualRemove().' );\r
+\r
        if( i = removal.length ){\r
                for( ; i; ){\r
                        xnode = removal[ --i ];\r
                        xnode._actualRemove();\r
                        !this._state && xnode.kill();\r
                };\r
-               removal.length = 0;             \r
+               removal.length = 0;\r
        };\r
-       \r
+\r
+       console.log( 'start _startUpdate().' );\r
+\r
        Node._html._dirty ? Node._html._commitUpdate() : this._commitUpdate();\r
        \r
-       X.Dom._listeners && X.Dom._listeners[ X.Dom.Event.AFTER_UPDATE ] && X.Dom.dispatch( { type : X.Dom.Event.AFTER_UPDATE } );\r
+       //console.log( 'end of _startUpdate().' );\r
+       \r
+       X.Dom._listeners && X.Dom._listeners[ X.Dom.Event.AFTER_UPDATE ] && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.AFTER_UPDATE } );\r
        //this._rawNode.style.visibility = tmp;\r
 };\r
 \r
 Node.prototype._commitUpdate =\r
-       document.getElementById ?\r
+       X.Dom.DOM_W3C ?\r
                ( function( parentElement, nextElement ){\r
                        var elm = this._rawNode,\r
                                xnodes, l, i, frg, next, k, v;\r
@@ -867,7 +887,7 @@ Node.prototype._commitUpdate =
                        } else\r
                        if( ( xnodes = this._xnodes ) && ( l = xnodes.length ) ) {\r
                                \r
-                               /*if( elm.childNodes.length !== l && ( frg = Node._useDocumentFragment ) ){\r
+                               /*if( elm.childNodes.length !== l && ( frg = X.Dom._useDocumentFragment ) ){\r
                                        for( i = 0; i < l; ++i ){\r
                                                frg.appendChild( xnodes[ i ]._actualCreate( true ) );\r
                                        };\r
@@ -882,13 +902,14 @@ Node.prototype._commitUpdate =
                                //};\r
                        };\r
 \r
+                       delete this._fontSize;\r
                        this._dirty && this._updateRawNode( elm );\r
                        if( this._state & X.Dom.State.IE5_DISPLAY_NONE_FIX ){\r
                                return nextElement;\r
                        };\r
                        return elm;\r
                }) :\r
-       document.all ? \r
+       X.Dom.DOM_IE4 ? \r
                ( function( parentElement, prevElement ){\r
                        var elm    = this._rawNode || this._ie4getRawNode(),\r
                                xnodes, l, i, html, text, prev;\r
@@ -928,13 +949,15 @@ Node.prototype._commitUpdate =
                                        prev = xnodes[ i ]._commitUpdate( elm, prev );\r
                                };\r
                        };\r
+                       \r
+                       delete this._fontSize;\r
                        this._dirty && this._updateRawNode( elm );\r
                        return elm;\r
                }) :\r
                (function(){});\r
 \r
 Node.prototype._updateRawNode =\r
-       document.getElementById ?\r
+       X.Dom.DOM_W3C ?\r
                ( function( elm ){\r
                        var attrs, rename, k, v;\r
 \r
@@ -946,32 +969,25 @@ Node.prototype._updateRawNode =
                        };\r
                        // id\r
                        if( this._dirty & X.Dom.Dirty.ID ){\r
-                               //if( X.UA.IE && X.UA.IE < 7 ){\r
-                                       this._id ? ( elm.id = this._id ) : ( elm.id && elm.removeAttribute( 'id' ) );           \r
-                               //} else {\r
-                               //      this._id ? ( elm.id = this._id ) : elm.removeAttribute( 'id' );                                 \r
-                               //};\r
+                               this._id ? ( elm.id = this._id ) : ( elm.id && elm.removeAttribute( 'id' ) );           \r
                        };\r
                        // className\r
                        if( this._dirty & X.Dom.Dirty.CLASSNAME ){\r
-                               //if( X.UA.IE && X.UA.IE < 8 ){\r
-                                       //elm.className = this._className;\r
+                               this._className ? ( elm.className = this._className ) : ( elm.className && elm.removeAttribute( X.UA.IE ? 'className' : 'class' ) );                                    \r
 \r
-                               //} else {\r
-                                       this._className ? ( elm.className = this._className ) : ( elm.className && elm.removeAttribute( 'class' ) );                                    \r
-                               //};\r
-                                       // ie5 only\r
-                                       if( X.Dom.State.IE5_DISPLAY_NONE_FIX && elm.currentStyle.display === 'none' ){\r
-                                               this._actualRemove();\r
-                                               this._state |= X.Dom.State.IE5_DISPLAY_NONE_FIX;\r
-                                               return;\r
-                                       };\r
+                               // ie5 only\r
+                               if( X.Dom.State.IE5_DISPLAY_NONE_FIX && elm.currentStyle.display === 'none' ){\r
+                                       this._actualRemove();\r
+                                       this._state |= X.Dom.State.IE5_DISPLAY_NONE_FIX;\r
+                                       return;\r
+                               };\r
                        };\r
                        // style\r
                        if( this._dirty & X.Dom.Dirty.CSS ){\r
-                               if( this._cssText || ( this._cssText = X.Dom.Style.objToCssText( this._css ) ) ){\r
-                                       elm.style.cssText = this._cssText;\r
-                                       //elm.setAttribute( 'style', this._cssText );\r
+                               if( this._cssText !== null || ( this._cssText = X.Dom.Style.objToCssText( this._css ) ) ){\r
+                                       X.UA.Opera78 || X.UA.NN6 ?\r
+                                               elm.setAttribute( 'style', this._cssText ) : // opera8用\r
+                                               ( elm.style.cssText = this._cssText );\r
                                } else {\r
                                        elm.style.cssText = ''; // IE5.5以下 Safari3.2 で必要\r
                                        elm.removeAttribute( 'style' );\r
@@ -987,7 +1003,7 @@ Node.prototype._updateRawNode =
                        if( this._dirty & X.Dom.Dirty.ATTR && ( attrs = this._newAttrs || this._attrs ) ){\r
                                rename = X.Dom.Attr.renameForDOM;\r
                                for( k in attrs ){\r
-                                       if( 5 <= X.UA.IE && X.UA.IE < 6 ){ // IETester 5.5 ではエラーが出なかった.MultipulIE5.5 ではエラーが出たので\r
+                                       if( !X.UA.MacIE && 5 <= X.UA.IE && X.UA.IE < 6 ){ // IETester 5.5 ではエラーが出なかった.MultipulIE5.5 ではエラーが出たので\r
                                                if( this._tag === 'TEXTAREA' && k === 'value' ){\r
                                                        elm.firstChild ?\r
                                                                ( elm.firstChild.data = attrs[ k ] ) :\r
@@ -995,16 +1011,18 @@ Node.prototype._updateRawNode =
                                                        continue;\r
                                                };\r
                                        };\r
+                                       k = \r
                                        ( v = attrs[ k ] ) === undefined ?\r
                                                elm.removeAttribute( rename[ k ] || k ) :\r
-                                               ( elm[ rename[ k ] || k ] = v );\r
+                                               ( elm[ rename[ k ] || k ] = X.Dom.Attr.noValue[ k ] ? k : v );                          \r
+\r
                                };\r
                                delete this._newAttrs;\r
                        };\r
                        \r
                        delete this._dirty;\r
                }) :\r
-       document.all ? \r
+       X.Dom.DOM_IE4 ? \r
                ( function( elm ){\r
                        var attrs, rename, k, v;\r
 \r
@@ -1028,7 +1046,7 @@ Node.prototype._updateRawNode =
                        };\r
                        // style\r
                        if( this._dirty & X.Dom.Dirty.CSS ){\r
-                               if( this._cssText || ( this._cssText = X.Dom.Style.objToCssText( this._css ) ) ){\r
+                               if( this._cssText !== null || ( this._cssText = X.Dom.Style.objToCssText( this._css ) ) ){\r
                                        elm.style.cssText = this._cssText;\r
                                } else {\r
                                        elm.style.cssText = '';\r
@@ -1047,7 +1065,7 @@ Node.prototype._updateRawNode =
                                for( k in attrs ){\r
                                        ( v = attrs[ k ] ) === undefined ?\r
                                                elm.removeAttribute( rename[ k ] || k ) :\r
-                                               elm.setAttribute( rename[ k ] || k, v );\r
+                                               elm.setAttribute( rename[ k ] || k, v ); // TODO X.Dom.Attr.noValue\r
                                };\r
                                delete this._newAttrs;\r
                        };\r
@@ -1067,14 +1085,14 @@ Node.prototype._updateRawNode =
  * ie7 以下では iframe の frameborder や、input name は、createElement 後に setAttribute しても無視される\r
  * \r
  * fragument がある場合 children も足して\r
- * Mozilla: 1.0+, IE: 6.0+, Netscape: 2.0+, Safari: 1.0+, Opera: 7.0+\r
+ * Mozilla: 1.0+, IE: 5.5+, Netscape: 2.0+, Safari: 1.0+, Opera: 7.0+\r
  * ie6 大丈夫?fragment の場合リークしないか?チェックが必要\r
  * http://msdn.microsoft.com/ja-jp/library/bb250448%28v=vs.85%29.aspx\r
  * \r
  * document.createElement of ie4 is only for OPTION & IMAGE.\r
  */\r
 Node.prototype._actualCreate =\r
-       document.getElementById ? (function( isChild ){\r
+       X.Dom.DOM_W3C ? (function( isChild ){\r
                var elm = this._rawNode,\r
                        xnodes, frg, i, l;\r
                \r
@@ -1090,20 +1108,20 @@ Node.prototype._actualCreate =
                        };\r
                        this._isNew = true;\r
                        this._rawNode = elm =\r
-                               ie55 <= X.UA.IE && X.UA.IE < 9 ?\r
+                               X.Dom._strictElmCreation ?\r
                                        document.createElement( [\r
                                                '<', this._tag,\r
                                                        ' UID="', this._uid, '"',\r
                                                        this._id ? ' id="' + this._id + '"' : '',\r
                                                        this._className ? ' class="' + this._className + '"' : '',\r
-                                                       this._attrText || ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ),\r
+                                                       this._attrText === false ? ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ) : this._attrText,\r
                                                        this._cssText ? ' style="' + this._cssText + '"' : '',\r
                                                '>' ].join( '' ) ) :\r
                                        document.createElement( this._tag );\r
                };\r
-               if( Node._useDocumentFragment ){\r
+               if( X.Dom._useDocumentFragment ){\r
                        if( ( xnodes = this._xnodes ) && ( l = xnodes.length ) ){\r
-                               !isChild && ( frg = Node._useDocumentFragment ).appendChild( elm );\r
+                               !isChild && ( frg = X.Dom._useDocumentFragment ).appendChild( elm );\r
                                for( i = 0; i < l; ++i ){\r
                                        elm.appendChild( xnodes[ i ]._actualCreate( true ) );\r
                                };\r
@@ -1113,7 +1131,7 @@ Node.prototype._actualCreate =
                \r
                return elm;\r
        }) :\r
-       document.all ? (function( isChild ){\r
+       X.Dom.DOM_IE4 ? (function( isChild ){\r
                var uid = this._uid,\r
                        html, xnodes, n, i, l;\r
                \r
@@ -1130,7 +1148,7 @@ Node.prototype._actualCreate =
                        html = [\r
                                '<', this._tag, ' id=', ( this._id || ( 'ie4uid' + uid ) ), ' UID="', uid, '"',\r
                                this._className ? ' class="' + this._className + '"' : '',\r
-                               this._attrText || ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ),\r
+                               this._attrText === false ? ( this._attrText = X.Dom.Attr.objToAttrText( this._attrs ) ) : this._attrText,\r
                                this._cssText ? ' style="' + this._cssText + '"' : '',\r
                        '>' ];\r
                        \r
@@ -1148,7 +1166,7 @@ Node.prototype._actualCreate =
                                        };                                      \r
                                };\r
                        };\r
-                       X.Dom.DTD.EMPTY[ this._tag.toLowerCase() ] || ( html[ n ] = '<\/' + this._tag + '>' );\r
+                       X.Dom.DTD.EMPTY[ this._tag ] || ( html[ n ] = '<\/' + this._tag + '>' );\r
                        \r
                        delete this._newAttrs;\r
                };\r
@@ -1158,9 +1176,9 @@ Node.prototype._actualCreate =
        (function(){});\r
 \r
 Node.prototype._afterActualCreate =\r
-       document.getElementById ? (function(){\r
+       X.Dom.DOM_W3C ? (function(){\r
                var elm = this._rawNode, xnodes, l, attrs, k, i;\r
-               \r
+\r
                this._root  = this.parent._root;\r
                \r
                if( this._xnodeType === 3 ){\r
@@ -1172,16 +1190,12 @@ Node.prototype._afterActualCreate =
                l      = xnodes && xnodes.length;\r
                \r
                if( this._isNew ){\r
-                       if( !Node._useDocumentFragment && l ){// docFrg が使えない場合、doc 追加後に子を追加\r
+                       if( !X.Dom._useDocumentFragment && l ){// docFrg が使えない場合、doc 追加後に子を追加\r
                                for( i = 0; i < l; ++i ){\r
                                        elm.appendChild( xnodes[ i ]._actualCreate( true ) );\r
                                };\r
                        };\r
-                       //if( X.UA.IE && X.UA.IE < 5.5 ){\r
-                       //      this._dirty = X.Dom.Dirty.CSS | X.Dom.Dirty.IE_FILTER;\r
-                       //      this._updateRawNode( elm );\r
-                       //} else\r
-                       if( !X.UA.IE || X.UA.IE < ie55 || 9 <= X.UA.IE ){\r
+                       if( !X.Dom._strictElmCreation ){\r
                                elm.UID = this._uid;\r
                                this._newAttrs = this._attrs;\r
                                this._dirty = X.Dom.Dirty.ID | X.Dom.Dirty.CLASSNAME | X.Dom.Dirty.CSS | X.Dom.Dirty.ATTR | X.Dom.Dirty.IE_FILTER;\r
@@ -1202,10 +1216,11 @@ Node.prototype._afterActualCreate =
                                xnodes[ i ]._afterActualCreate();\r
                        };\r
                };\r
-               \r
+               // src の onload があるので先ではないか?\r
+               // ie の str から要素を作る場合、srcだけ イベント設定後ではないか?\r
                this._restoreEvent();// イベントの復帰\r
        }) :\r
-       document.all ? (function(){\r
+       X.Dom.DOM_IE4 ? (function(){\r
                var xnodes, i;\r
                this._root = this.parent._root;\r
                \r
@@ -1226,7 +1241,7 @@ Node.prototype._afterActualCreate =
        (function(){});\r
 \r
 Node.prototype._actualRemove =\r
-       document.getElementById ?\r
+       X.Dom.DOM_W3C ?\r
                ( function( isChild ){\r
                        var xnodes = this._xnodes,\r
                                elm    = this._rawNode,\r
@@ -1241,9 +1256,13 @@ Node.prototype._actualRemove =
                        if( !elm ) return;\r
                        this._xnodeType === 1 && this._migrateEvent();// イベントの退避\r
                        // elm.parentNode.tagName for ie7\r
-                       !isChild && elm.parentNode && elm.parentNode.tagName && elm.parentNode.removeChild( elm );\r
+                       if( !X.UA.MacIE ){\r
+                               !isChild && elm.parentNode && elm.parentNode.tagName && elm.parentNode.removeChild( elm );\r
+                       } else {\r
+                               !isChild && elm.parentNode && elm.parentNode.tagName && X.Dom._fixed_remove( elm, this );\r
+                       };\r
                }) :\r
-       document.all ?\r
+       X.Dom.DOM_IE4 ?\r
                ( function( isChild ){\r
                        var xnodes = this._xnodes,\r
                                elm    = this._rawNode || this._ie4getRawNode(),\r
@@ -1257,16 +1276,15 @@ Node.prototype._actualRemove =
                        if( !elm ) return;\r
                        this._xnodeType === 1 && this._migrateEvent();// イベントの退避\r
                        \r
+                       if( X.Dom.Attr.HAS_VALUE[ this._tag ] && ( !this._newAttrs || !X.inObject( 'value', this._newAttrs ) ) ){\r
+                               this._attrs.value = elm.value;\r
+                       };\r
                        elm.removeAttribute( 'id' ); // ?\r
-                       document.all[ this._id || ( 'ie4uid' + this._uid ) ] = null; // ?\r
+                       document.all[ this._id || ( 'ie4uid' + this._uid ) ] = null; // MacIE5 でエラー\r
                        if( !isChild ) elm.outerHTML = '';\r
                        delete this._rawNode;\r
                }) :\r
                (function(){});\r
-       \r
-       \r
-//})( window, document );\r
-\r
-\r
 \r
+console.log( 'X.Dom.Node' );\r
 \r