Version 0.6.52, fix X.UI.

[pettanr/clientJs.git] / 0.6.x / js / dom / 10_XDom.js

diff --git a/0.6.x/js/dom/10_XDom.js b/0.6.x/js/dom/10_XDom.js
index e39e4eb..796d07b 100644 (file)
--- a/0.6.x/js/dom/10_XDom.js
+++ b/0.6.x/js/dom/10_XDom.js
@@ -3,7 +3,7 @@ X.Dom = X.Class._override(
        new X.EventDispatcher(),\r
        {\r
                readyState   : -1,\r
-               active       : !!document.activeElement,\r
+               active       : !!window.parent || !!document.activeElement, // frameに読み込まれた場合のieのerror回避\r
                _root        : null,\r
 \r
                _lock        : false,\r
@@ -62,11 +62,13 @@ X.Dom = X.Class._override(
                _init : function(){\r
                        var s, size, h, r;\r
                        if( X.Dom.Event.DOM_PRE_INIT <= X.Dom.readyState ) return X.Callback.UN_LISTEN;\r
+                       \r
+                       console.log( 'X.Dom._init()' );\r
+                       \r
                        delete X.Dom._init;\r
                        X.Dom.readyState = X.Dom.Event.DOM_PRE_INIT;\r
                        \r
-                       /* if( X.UA.IE ) */\r
-                       X.Dom._root = ( document.compatMode !== 'CSS1Compat' ? document.body : document.documentElement );\r
+                       X.Dom._root = document.compatMode !== 'CSS1Compat' ? document.body : document.documentElement || document.body;\r
 \r
                        h = Node._html = document.documentElement ?\r
                                        new Node( document.documentElement ) :\r
@@ -262,7 +264,19 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
        };\r
 };\r
 \r
-if( document.getElementById && ( !X.UA.IEMobile || 5 <= X.UA.IE ) ){\r
+/*\r
+ * http://d.hatena.ne.jp/t-uchima/20051003/p1\r
+ * MacIEにはattachEventが一応あるけどwindow.attachEventとdocument.attachEventしかなく他の要素にはattachEventはない。\r
+ */\r
+if( X.UA.MacIE || X.UA.NetFront ){\r
+       X.Dom.DOM_W3C    = true;\r
+       X.Dom.EVENT_DOM0 = true;\r
+} else\r
+if( X.UA.IE4 ){ // ie4 & iemobi4\r
+       X.Dom.DOM_IE4    = true;\r
+       X.Dom.EVENT_DOM0 = true;\r
+} else\r
+if( document.getElementById ){\r
        X.Dom.DOM_W3C = true;\r
        if( document.addEventListener ){\r
                X.Dom.EVENT_W3C = true;\r
@@ -276,10 +290,17 @@ if( document.getElementById && ( !X.UA.IEMobile || 5 <= X.UA.IE ) ){
 if( document.all ){\r
        X.Dom.DOM_IE4    = true;\r
        X.Dom.EVENT_DOM0 = true;\r
+} else\r
+if( document.layers ){\r
+       \r
+} else {\r
+       \r
 };\r
 \r
 X.Dom.moveToHead = {\r
        STYLE   : true,\r
+       LINK    : true,\r
+       TITLE   : true,\r
        BGSOUND : true,\r
        AREA    : true,\r
        BASE    : true,\r
@@ -305,9 +326,12 @@ X.Dom.skipCleanupTagNames = {
        PLAINTEXT : true,\r
        LISTING   : true\r
 };\r
+\r
+X.Dom.CRLF = String.fromCharCode( 13 ) + String.fromCharCode( 10 );\r
                \r
 X.Dom.cleanupWhiteSpace = function( text ){\r
-       var _ = ' ', __ = '  ';\r
+       var _ = ' ', __ = '  ', CRLF = X.Dom.CRLF;\r
+       //text.indexOf( CRLF )   !== -1 && ( text = text.split( CRLF ).join( _ ) );\r
        text.indexOf( '\n\r' ) !== -1 && ( text = text.split( '\n\r' ).join( _ ) );\r
        text.indexOf( '\t' )   !== -1 && ( text = text.split( '\t' ).join( _ ) );\r
        text.indexOf( '\r' )   !== -1 && ( text = text.split( '\r' ).join( _ ) );\r
@@ -382,3 +406,4 @@ X.Dom.getAbsolutePath = function( path ){
        return [ _ary[ 0 ], ss, ary.join( s ), s, path ].join( '' );\r
 };\r
 \r
+console.log( 'X.Dom dom:w3c=' + X.Dom.DOM_W3C + ' ev:w3c=' + X.Dom.EVENT_W3C );\r