Version 0.6.47, fix for IE5 & Opera7.x.

[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 4fe822d..e39e4eb 100644 (file)
--- a/0.6.x/js/dom/10_XDom.js
+++ b/0.6.x/js/dom/10_XDom.js
@@ -62,12 +62,6 @@ 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
-                       if( s = X.Dom._script ){\r
-                               s.parentNode.removeChild( s );\r
-                               s.onreadystatechange = X.emptyFunction;\r
-                               s.onreadystatechange = null;\r
-                               delete X.Dom._script;\r
-                       };\r
                        delete X.Dom._init;\r
                        X.Dom.readyState = X.Dom.Event.DOM_PRE_INIT;\r
                        \r
@@ -97,7 +91,7 @@ X.Dom = X.Class._override(
                        \r
                        X.Dom.listenOnce( X.Dom.Event.DOM_BUILDER_COMPLETE, function(){\r
                                X.Dom.readyState = X.Dom.Event.DOM_INIT;\r
-                               \r
+                               //X.UA.Opera7 && alert( 'bc' );\r
                                Node.root.appendAt( 0,\r
                                        Node._systemNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ),\r
                                        Node._fontSizeNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ).cssText( 'line-height:1;height:1em;' ).text( 'X' )\r
@@ -138,11 +132,11 @@ X.Dom = X.Class._override(
                                Node._document.listen( 'webkitvisibilitychange', X.Dom );\r
                        } else\r
                        if( X.UA.iOS && window[ 'onpageshow' ] !== undefined ) {\r
-                               Node._window.listen('pageshow', X.Dom );\r
-                               Node._window.listen('pagehide', X.Dom );\r
+                               Node._window.listen( 'pageshow', X.Dom )\r
+                                                       .listen( 'pagehide', X.Dom );   \r
                        } else {\r
-                               Node._window.listen('focus', X.Dom );\r
-                               Node._window.listen('blur', X.Dom );\r
+                               Node._window.listen( 'focus', X.Dom )\r
+                                                       .listen( 'blur', X.Dom );\r
                        };\r
 \r
                        return X.Callback.UN_LISTEN;\r
@@ -206,6 +200,7 @@ X.Dom = X.Class._override(
                _getSize :\r
                        X.UA.IE ?\r
                                new Function( 'return[X.Dom._root.clientWidth,X.Dom._root.clientHeight]' ) :\r
+\r
                                new Function( 'return[window.innerWidth,window.innerHeight]' ),\r
                \r
                getSize : function(){\r
@@ -223,7 +218,11 @@ X.Dom = X.Class._override(
                // Safari2.0.4では標準・互換どちらも document.body\r
                        \r
                        Node.root._updateTimerID && Node.root._startUpdate();\r
-                       \r
+                       /*X.UA.Opera ?\r
+                               ( document.documentElement && document.documentElement.clientWidth ?\r
+                                       new Function( 'return[document.documentElement.clientWidth,document.documentElement.clientHeight]' ) :\r
+                                       new Function( 'return[document.body.clientWidth,document.body.clientHeight]' )\r
+                               ) :*/                   \r
                        return [\r
                                X.Dom._root.scrollWidth  || X.Dom._root.offsetWidth,\r
                                X.Dom._root.scrollHeight || X.Dom._root.offsetHeight\r
@@ -279,14 +278,33 @@ if( document.all ){
        X.Dom.EVENT_DOM0 = true;\r
 };\r
 \r
+X.Dom.moveToHead = {\r
+       STYLE   : true,\r
+       BGSOUND : true,\r
+       AREA    : true,\r
+       BASE    : true,\r
+       META    : true\r
+};\r
+\r
 X.Dom.cleanupTagNames = {\r
-               noscript : 1,\r
-               noframes : 1,\r
-               '!'      : 1,\r
-               noembed  : 1,\r
-               nolayer  : 1\r
+               SCRIPT   : true,\r
+               NOSCRIPT : true,\r
+               NOFRAMES : true,\r
+               '!'      : true, // ie\r
+               COMMENT  : true, // ie\r
+               NOEMBED  : true,\r
+               NOLAYER  : true\r
        };\r
-X.Dom.skipCleanupTagNames = 'pre,textarea,code,kbd,samp,xmp,plaintext,listing'.split( ',' );\r
+X.Dom.skipCleanupTagNames = {\r
+       PRE       : true,\r
+       TEXTAREA  : true,\r
+       CODE      : true,\r
+       KBD       : true,\r
+       SAMP      : true,\r
+       XMP       : true,\r
+       PLAINTEXT : true,\r
+       LISTING   : true\r
+};\r
                \r
 X.Dom.cleanupWhiteSpace = function( text ){\r
        var _ = ' ', __ = '  ';\r