OSDN Git Service

Version 0.6.35, bugfix.
authoritozyun <itozyun@user.sourceforge.jp>
Wed, 16 Apr 2014 21:29:53 +0000 (06:29 +0900)
committeritozyun <itozyun@user.sourceforge.jp>
Wed, 16 Apr 2014 21:29:53 +0000 (06:29 +0900)
0.6.x/js/core/00_X.js
0.6.x/js/core/01_XUa.js
0.6.x/js/core/04_XClass.js
0.6.x/js/dom/10_XDom.js
0.6.x/js/dom/11_XDomNode.js
0.6.x/js/dom/15_XDomStyle.js
0.6.x/js/dom/19_XDomParser.js
0.6.x/js/dom/22_XDomBuilder.js

index 5d5f0b2..9a0404f 100644 (file)
@@ -81,3 +81,5 @@ X.matchTest = function( array1, array2 ){
        \r
 // bonus: hotfix for IE6 SP1 (bug KB823727)\r
 document.execCommand && document.execCommand( 'BackgroundImageCache', false, true );\r
+document.execCommand && document.execCommand( 'LiveResize', false, false );\r
+document.execCommand && document.execCommand( 'SizeToControl', false, false );
\ No newline at end of file
index c0a34b4..679912e 100644 (file)
@@ -39,6 +39,8 @@ X.UA.Android  = navigator.userAgent.toLowerCase().indexOf( 'android' ) !== -1;
 X.UA.iOS      = navigator.userAgent.toLowerCase().indexOf( 'iphone' ) !== -1 ||\r
                                navigator.userAgent.toLowerCase().indexOf( 'ipad' ) !== -1 ||\r
                                navigator.userAgent.toLowerCase().indexOf( 'ipod' ) !== -1;\r
+X.UA.IEMobile = navigator.userAgent.toLowerCase().indexOf( 'iemobile' ) !== -1 ||\r
+                               ( X.UA.IE && navigator.userAgent.toLowerCase().indexOf( 'windows phone' ) !== -1 );\r
 X.UA.TouchPad = navigator.userAgent.toLowerCase().indexOf( 'hp-tablet' ) !== -1;\r
 \r
 X.UA.EInk =\r
index ac2c1a6..9fc4fd3 100644 (file)
@@ -18,22 +18,13 @@ X.Class = ( function(){
                killPrivateFlag    = false,\r
                traits             = null,\r
                _slice             = Array.prototype.slice;\r
-               \r
-       function copyArray( list ){\r
-       //return _slice.call( list, 0 );\r
-       var i = list.length, ret = [];\r
-       for( ; i; ){\r
-               ret[ --i ] = list[ i ];\r
-       };\r
-       return ret;\r
-       };\r
        \r
        /* サブクラスを作るメソッド  \r
         * var subClass = superClass.inherits( ... ) \r
         * http://d.hatena.ne.jp/m-hiyama/20051018/1129605002\r
         */\r
        function inherits( /* displayName, classSetting, opt_PrivateClass, props */ ){\r
-               var args        = copyArray( arguments ),\r
+               var args        = X.copyArray( arguments ),\r
                        params      = [],\r
                        Super       = this,\r
                        superDef    = X.Class._getClassDef( Super ),\r
@@ -41,40 +32,51 @@ X.Class = ( function(){
                        classSetting,\r
                        opt_super,\r
                        klass, def;\r
-               if( superDef.Final === true ) X.Notification.critical( 'X.Class inherits, Class is final!' );\r
+               if( superDef.Final ) X.Notification.critical( 'X.Class inherits, Class is final!' );\r
                \r
-               if( X.Type.isString( displayName ) === true ){\r
+               // サブクラス名\r
+               if( X.Type.isString( displayName ) ){\r
                        args.shift();\r
                } else {\r
                        displayName = 'SubClass of ' + superDef.displayName;\r
                };\r
                params.push( displayName );\r
                \r
+               // サブクラス設定\r
                classSetting = args[ 0 ];\r
-               if( X.Type.isNumber( classSetting ) === true ){\r
-                       if( superDef.isPrivate === true ) classSetting = classSetting | X.Class.PRIVATE_DATA;\r
-                       opt_super = !!( classSetting & X.Class.SUPER_ACCESS );\r
-                       params.push( classSetting );\r
+               if( X.Type.isNumber( classSetting ) ){\r
                        args.shift();\r
+               } else {\r
+                       classSetting = superDef.setting;\r
                };\r
+               if( superDef.isPrivate ) classSetting = classSetting | X.Class.PRIVATE_DATA;\r
+               opt_super = !!( classSetting & X.Class.SUPER_ACCESS );\r
+               params.push( classSetting );\r
+\r
+               // サブクラスのシャドウ\r
                if( X.Class._getClass( args[ 0 ] ) ){\r
                        params.push( args.shift() );\r
                } else\r
                if( superDef.privateClass ){\r
                        params.push( superDef.privateClass );\r
                };\r
-               params.push( args[ 0 ] ); /* props */\r
+               params.push( args[ 0 ] ); /* props サブクラスでは未定義でも可 */\r
+               \r
+               // 継承クラスの作成\r
                Super.__new = null;\r
                traits = new Super();\r
                Super.__new = C;\r
-               klass  = X.Class.create.apply( null, params );\r
+               klass  = X.Class.create.apply( X.Class, params );\r
                traits = null;\r
+               \r
+               // 継承用プロパティを控える\r
                if( opt_super === true ){\r
                        def = X.Class._getClassDef( klass );\r
                        def.Super = Super;\r
                        def.SuperProto = Super.prototype;\r
                        def.SuperConstructor = superDef[ CONSTRUCTOR ];\r
                };\r
+               \r
                return klass;\r
        };\r
        \r
@@ -176,7 +178,7 @@ X.Class = ( function(){
                SUPER_ACCESS : 8,\r
                PRIVATE_DATA : 16,\r
                create : function( /* displayName, classSetting, opt_PrivateClass, props */ ){\r
-                       var args        = copyArray( arguments ),\r
+                       var args        = X.copyArray( arguments ),\r
                                displayName = args[ 0 ],\r
                                classSetting,\r
                                opt_pool, opt_abstract, opt_final, opt_private,\r
@@ -188,19 +190,24 @@ X.Class = ( function(){
                                classDef.displayName = displayName;\r
                                args.shift();\r
                        };\r
-                       classSetting = args[ 0 ];\r
-                       if( X.Type.isNumber( classSetting ) === true ){\r
+                       \r
+                       // クラス設定\r
+                       classDef.setting = classSetting = args[ 0 ];\r
+                       if( X.Type.isNumber( classSetting ) ){\r
                                opt_pool     = !!( classSetting & X.Class.POOL_OBJECT  );\r
                                opt_abstract = !!( classSetting & X.Class.ABSTRACT     );\r
                                opt_final    = !!( classSetting & X.Class.FINAL        );\r
                                opt_private  = !!( classSetting & X.Class.PRIVATE_DATA );\r
-                               if( opt_final === true && opt_abstract === true ){\r
+                               if( opt_final && opt_abstract ){\r
                                        X.Notification.critical( 'final & Abstract!' );\r
                                        return;\r
-                               };                              \r
+                               };      \r
                                args.shift();\r
+                       } else {\r
+                               classDef.setting = 0;\r
                        };\r
                        \r
+                       // シャドウクラス\r
                        if( PRIVATE_CLASS_LIST.indexOf( args[ 0 ] ) !== -1 ){\r
                                privateDef = X.Class._getClassDef( args[ 0 ] );\r
                                if( privateDef.isPrivate !== true ){\r
@@ -213,13 +220,18 @@ X.Class = ( function(){
                                };\r
                                classDef.privateClass = args.shift();\r
                        };\r
-                       props = args[ 0 ];\r
-                       if( props === null || X.Type.isObject( props ) === false ){\r
-                               X.Notification.critical( 'No Class Def!' );\r
-                               return;\r
-                       };\r
                        \r
-                       if( props[ CONSTRUCTOR ] && X.Type.isFunction( props[ CONSTRUCTOR ] ) === true ){\r
+                       // インスタンスのメンバー\r
+                       props = args[ 0 ];\r
+                       if( props === null || !X.Type.isObject( props ) ){\r
+                               // サブクラスの場合、クラス定義の上書きがなくても作成可能\r
+                               if( !traits ){\r
+                                       X.Notification.critical( 'No Class Def!' );\r
+                                       return;                                 \r
+                               };\r
+                               props = {};\r
+                       } else\r
+                       if( props[ CONSTRUCTOR ] && X.Type.isFunction( props[ CONSTRUCTOR ] ) ){\r
                                classDef[ CONSTRUCTOR ] = props[ CONSTRUCTOR ];\r
                        };\r
                        \r
@@ -289,7 +301,7 @@ X.Class = ( function(){
                        if( PRIVATE_DEF_LIST.indexOf( KlassOrInstance ) !== -1 ) return KlassOrInstance;\r
                },\r
                _newPrivate : function( /* instance, args */ ){\r
-                       var args         = copyArray( arguments ),\r
+                       var args         = X.copyArray( arguments ),\r
                                user         = args.shift(),\r
                                def          = X.Class._getClassDef( user ),\r
                                privateClass = def.privateClass,\r
index 7d3313f..fbcfecb 100644 (file)
-(function( window, document ){\r
-       var lock = 0, w = 0, h = 0,\r
-               resize, fontSize;\r
+       \r
+X.Dom = X.Class._override(\r
+       new X.EventDispatcher(),\r
+       {\r
+               readyState   : -1,\r
+               active       : true,\r
+               _root        : null,\r
+\r
+               _lock        : false,\r
+               w            : 0,\r
+               h            : 0,\r
+               baseFontSize : 0,\r
 \r
 /* -----------------------------------------------\r
  * Resize\r
  *  original : uupaa.js\r
  */\r
-       resize =\r
-               X.UA.IE && X.UA.IE < 9 ?\r
-                       (function(){\r
-                               var size;\r
-                               if( !lock ){\r
-                                       size = X.Dom.getSize();\r
-                                       if( w !== size[ 0 ] || h !== size[ 1 ] ){\r
-                                               w = size[ 0 ];\r
-                                               h = size[ 1 ];\r
-                                               X.Timer.once( 100, detectFinishResizing );\r
-                                               lock = true;\r
+               _resize :\r
+                       X.UA.IE && X.UA.IE < 9 ?\r
+                               (function(){\r
+                                       var size;\r
+                                       if( !X.Dom._lock ){\r
+                                               size = X.Dom._getSize();\r
+                                               if( X.Dom.w !== size[ 0 ] || X.Dom.h !== size[ 1 ] ){\r
+                                                       X.Dom.w = size[ 0 ];\r
+                                                       X.Dom.h = size[ 1 ];\r
+                                                       X.Timer.once( 100, X.Dom._detectFinishResizing );\r
+                                                       X.Dom._lock = true;\r
+                                               };\r
                                        };\r
-                               };\r
+                                       \r
+                                       size = Node._fontSizeNode._rawNode.offsetHeight;\r
+                                       if( X.Dom.baseFontSize !== size ){\r
+                                               X.Dom.baseFontSize && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.BASE_FONT_RESIZED, size : size } );\r
+                                               X.Dom.baseFontSize = size;\r
+                                       };\r
+                                       \r
+                               }) :\r
+                               (function( e ){\r
+                                       !X.Dom._lock && ( X.Dom._lock = true ) && X.Timer.once( 100, X.Dom._detectFinishResizing );\r
+                                       return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;\r
+                               }),     \r
+               \r
+               _detectFinishResizing : function (){\r
+                       var size = X.Dom._getSize();\r
+                       if( X.Dom.w !== size[ 0 ] || X.Dom.h !== size[ 1 ] ){\r
+                               X.Dom.w = size[ 0 ];\r
+                               X.Dom.h = size[ 1 ];\r
+                               X.Timer.once( 100, X.Dom._detectFinishResizing );\r
+                       } else {\r
+                               X.Dom.asyncDispatch( 0, { type : X.Dom.Event.VIEW_RESIZED, w : X.Dom.w, h : X.Dom.h } );\r
+                               X.Dom._lock = false;\r
+                       };\r
+               },\r
+\r
+               _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
+                       /* if( X.UA.IE ) */\r
+                       X.Dom._root = ( document.compatMode !== 'CSS1Compat' ? document.body : document.documentElement );\r
+\r
+                       h = Node._html = document.documentElement ?\r
+                                       new Node( document.documentElement ) :\r
+                               document.getElementsByTagName ?\r
+                                       new Node( document.getElementsByTagName( 'html' )[ 0 ] ) :\r
+                               document.all ?\r
+                                       new Node( document.all.tags( 'html' )[ 0 ] ) :\r
+                                       null;\r
+               \r
+                       r = Node.root = new Node( document.body );\r
+                       h.appendTo = h.appendToRoot = h.before = h.after = h.clone = h.remove = h.destroy = h.prevNode = h.nextNode = h.createText = h.append = h.appendAt = h.empty = h.html = h.text =\r
+                       r.appendTo = r.appendToRoot = r.before = r.after = r.clone = r.remove = r.destroy = r.prevNode = r.nextNode = new Function( 'return this' );\r
+                       \r
+                       r._root  = h._root = r;\r
+                       r.parent = h;\r
+                       h._xnodes = [ r ];\r
+\r
+                       X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT, function(){\r
+                               X.Dom.readyState = X.Dom.Event.DOM_BUILDER_COMPLETE;\r
+                               !X.Dom._useBuilder && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.DOM_BUILDER_COMPLETE } );\r
+                       } );\r
+                       \r
+                       X.Dom.listenOnce( X.Dom.Event.DOM_BUILDER_COMPLETE, function(){\r
+                               X.Dom.readyState = X.Dom.Event.DOM_INIT;\r
                                \r
-                               size = Node._fontSizeNode._rawNode.offsetHeight;\r
-                               if( fontSize !== size ){\r
-                                       fontSize && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.BASE_FONT_RESIZED, size : size } );\r
-                                       fontSize = size;\r
-                               };\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
+                               )._startUpdate();\r
                                \r
-                       }) :\r
-                       (function( e ){\r
-                               !lock && ( lock = true ) && X.Timer.once( 100, detectFinishResizing );\r
-                               return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;\r
-                       });\r
+                               X.Dom.asyncDispatch( 0, { type : X.Dom.Event.DOM_INIT } );\r
+                       } );\r
 \r
-       detectFontSize = ( !X.UA.IE || 9 <= X.UA.IE ) && function(){\r
-               var size = Node._fontSizeNode._rawNode.offsetHeight;\r
-               if( fontSize !== size ){\r
-                       fontSize && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.BASE_FONT_RESIZED, size : size } );\r
-                       fontSize = size;\r
-               };\r
-       };\r
+                       X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){\r
+                               var size = X.Dom._getSize();\r
 \r
-       function detectFinishResizing(){\r
-               var size = X.Dom.getSize();\r
-               if( w !== size[ 0 ] || h !== size[ 1 ] ){\r
-                       w = size[ 0 ];\r
-                       h = size[ 1 ];\r
-                       X.Timer.once( 100, detectFinishResizing );\r
-               } else {\r
-                       X.Dom.asyncDispatch( 0, { type : X.Dom.Event.VIEW_RESIZED, w : w, h : h } );\r
-                       lock = false;\r
-               };\r
-       };\r
-       \r
-       X.Dom = X.Class._override(\r
-               new X.EventDispatcher(),\r
-               {\r
-                       readyState : -1,\r
-                       active     : true,\r
-                       _root      : null,\r
-       \r
-                       /*\r
-                        * X.Dom.Event.XDOM_READY 以後に listen した場合の対策\r
-                        */\r
-                       listen : function( type ){\r
-                               var size;\r
-                               if( type <= X.Dom.readyState ){\r
-                                       size = X.Dom.getSize();\r
-                                       X.Dom.asyncDispatch( 0, { type : type, w : size[ 0 ], h : size[ 1 ] } );\r
+                               if( X.Dom._detectFontSize ){\r
+                                       X.Dom.Node._window.listen( 'resize', X.Dom._resize );\r
+                                       X.Timer.add( 333, X.Dom._detectFontSize );\r
+                               } else {\r
+                                       X.Timer.add( 333, X.Dom._resize );\r
                                };\r
-                               return X.EventDispatcher.prototype.listen.apply( X.Dom, arguments );\r
-                       },\r
-                       getPointerPosition : function(){\r
-                               \r
-                       },\r
-                       /* 要素が視界に入った  http://remysharp.com/2009/01/26/element-in-view-event-plugin/ */\r
-                       inView : function( elm ){\r
                                \r
-                       },\r
-                       _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
+                               X.Dom.baseFontSize = Node._fontSizeNode._rawNode.offsetHeight;\r
                                \r
-                               /* if( X.UA.IE ) */\r
-                               X.Dom._root = ( document.compatMode !== 'CSS1Compat' ? document.body : document.documentElement );\r
+                               X.Dom.readyState = X.Dom.Event.XDOM_READY;\r
+                               X.Dom.asyncDispatch( 0, { type : X.Dom.Event.XDOM_READY, w : X.Dom.w = size[ 0 ], h : X.Dom.h = size[ 1 ] } );\r
+                       } );\r
 \r
-                               h = Node._html = document.documentElement ?\r
-                                               new Node( document.documentElement ) :\r
-                                       document.getElementsByTagName ?\r
-                                               new Node( document.getElementsByTagName( 'html' )[ 0 ] ) :\r
-                                       document.all ?\r
-                                               new Node( document.all.tags( 'html' )[ 0 ] ) :\r
-                                               null;\r
-                       \r
-                               r = Node.root = new Node( document.body );\r
-                               h.appendTo = h.appendToRoot = h.before = h.after = h.clone = h.remove = h.destroy = h.prevNode = h.nextNode = h.createText = h.append = h.appendAt = h.empty = h.html = h.text =\r
-                               r.appendTo = r.appendToRoot = r.before = r.after = r.clone = r.remove = r.destroy = r.prevNode = r.nextNode = new Function( 'return this' );\r
-                               \r
-                               r._root  = h._root = r;\r
-                               r.parent = h;\r
-                               h._xnodes = [ r ];\r
+                       X.Dom.asyncDispatch( 0, { type : X.Dom.Event.DOM_PRE_INIT } );  \r
 \r
-                               X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT, function(){\r
-                                       X.Dom.readyState = X.Dom.Event.DOM_BUILDER_COMPLETE;\r
-                                       !X.Dom._useBuilder && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.DOM_BUILDER_COMPLETE } );\r
-                               } );\r
-                               \r
-                               X.Dom.listenOnce( X.Dom.Event.DOM_BUILDER_COMPLETE, function(){\r
-                                       X.Dom.readyState = X.Dom.Event.DOM_INIT;\r
-                                       \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
-                                       )._startUpdate();\r
-                                       \r
-                                       X.Dom.asyncDispatch( 0, { type : X.Dom.Event.DOM_INIT } );\r
-                               } );\r
+                       Node._window\r
+                               .listen( 'beforeunload', X.Dom )\r
+                               .listenOnce( 'unload', X.Dom );\r
 \r
-                               X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){\r
-                                       var size = X.Dom.getSize();\r
+                       if( document[ 'hidden' ] !== undefined ) {// iOS 7+\r
+                               Node._document.listen( 'visibilitychange', X.Dom );\r
+                       } else\r
+                       if( document[ 'webkitHidden' ] !== undefined ) {\r
+                               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
+                       } else {\r
+                               Node._window.listen('focus', X.Dom );\r
+                               Node._window.listen('blur', X.Dom );\r
+                       };\r
 \r
-                                       if( !X.UA.IE || 9 <= X.UA.IE ){\r
-                                               X.Dom.Node._window.listen( 'resize', resize );\r
-                                               X.Timer.add( 333, detectFontSize );\r
-                                       } else {\r
-                                               X.Timer.add( 333, resize );\r
-                                       };\r
+                       return X.Callback.UN_LISTEN;\r
+               },\r
+\r
+               handleEvent : function( e ){\r
+                       switch( e.type ){\r
+                               case 'beforeunload' :\r
                                        \r
-                                       fontSize = Node._fontSizeNode._rawNode.offsetHeight;\r
+                                       // ie では a href="javascript" な要素でも beforeunload が起こる\r
+                                       var href = e.relatedTarget && e.relatedTarget.href();\r
+                                       if( href && href.indexOf( 'javascript:' ) === 0 ) return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;\r
                                        \r
-                                       X.Dom.readyState = X.Dom.Event.XDOM_READY;\r
-                                       X.Dom.asyncDispatch( 0, { type : X.Dom.Event.XDOM_READY, w : w = size[ 0 ], h : h = size[ 1 ] } );\r
-                               } );\r
-\r
-                               X.Dom.asyncDispatch( 0, { type : X.Dom.Event.DOM_PRE_INIT } );  \r
+                                       return X.Dom.dispatch( { type : X.Dom.Event.BEFORE_UNLOAD } );\r
+                               case 'unload' :\r
+                                       X.Dom.dispatch( { type : X.Dom.Event.UNLOAD } );\r
+                                       \r
+                                       Node._window.unlisten();\r
+                                       Node._document.unlisten();\r
+                                       Node._html._actualRemove( true );\r
+                                       break;\r
+                               case 'visibilitychange' :\r
+                                       X.Dom.dispatch( { type : ( X.Dom.activate = document[ 'hidden' ] ) ? X.Dom.Event.VIEW_DEACTIVATE : X.Dom.Event.VIEW_ACTIVATE } );\r
+                                       break;\r
+                               case 'webkitvisibilitychange' :\r
+                                       X.Dom.dispatch( { type : ( X.Dom.activate = document[ 'webkitHidden' ] ) ? X.Dom.Event.VIEW_DEACTIVATE : X.Dom.Event.VIEW_ACTIVATE } );\r
+                                       break;\r
+                               case 'pageshow' :\r
+                               case 'focus' :\r
+                                       X.Dom.activate = true;\r
+                                       X.Dom.dispatch( { type : X.Dom.Event.VIEW_ACTIVATE } );\r
+                                       break;\r
+                               case 'pagehide' :\r
+                               case 'blur' :\r
+                                       X.Dom.activate = false;\r
+                                       X.Dom.dispatch( { type : X.Dom.Event.VIEW_DEACTIVATE } );\r
+                                       break;\r
+                       };\r
+               },\r
 \r
-                               Node._window\r
-                                       .listen( 'beforeunload', X.Dom )\r
-                                       .listenOnce( 'unload', X.Dom );\r
+               listen : function( type ){\r
+                       if( type <= X.Dom.readyState ){\r
+                               /*\r
+                                * X.Dom.Event.XDOM_READY 以後に listen した場合の対策\r
+                                */\r
+                               X.Dom.asyncDispatch( 0, { type : type, w : X.Dom.w, h : X.Dom.h } );\r
+                       };\r
+                       return X.EventDispatcher.prototype.listen.apply( X.Dom, arguments );\r
+               },\r
+               \r
+               getPointerPosition : function(){\r
+                       \r
+               },\r
+               \r
+               /* 要素が視界に入った  http://remysharp.com/2009/01/26/element-in-view-event-plugin/ */\r
+               inView : function( elm ){\r
+                       \r
+               },\r
 \r
-                               if( document[ 'hidden' ] !== undefined ) {// iOS 7+\r
-                                       Node._document.listen( 'visibilitychange', X.Dom );\r
-                               } else\r
-                               if( document[ 'webkitHidden' ] !== undefined ) {\r
-                                       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
-                               } else {\r
-                                       Node._window.listen('focus', X.Dom );\r
-                                       Node._window.listen('blur', X.Dom );\r
-                               };\r
+               _getSize :\r
+                       X.UA.IE ?\r
+                               new Function( 'return[X.Dom._root.clientWidth,X.Dom._root.clientHeight]' ) :\r
+                               new Function( 'return[window.innerWidth,window.innerHeight]' ),\r
+               \r
+               getSize : function(){\r
+                       return [ X.Dom.w, X.Dom.h ];\r
+               },\r
+//https://developer.mozilla.org/en-US/docs/Web/API/Element.getBoundingClientRect\r
+//use window.pageXOffset and window.pageYOffset instead of window.scrollX and window.scrollY\r
+//(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollLeft == 'number' ? t : document.body).ScrollLeft;\r
+//(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollTop == 'number' ? t : document.body).ScrollTop\r
+               \r
+               getDocumentSize : function(){\r
+                       // Opera は互換モードでは document.body.scrollHeight、標準モードでは document.documentElement.scrollHeight でページの高さが取れる。と思ってたんだけど、例外があった。\r
+                       // http://orera.g.hatena.ne.jp/edvakf/20100515/1273908051\r
+               //http://onozaty.hatenablog.com/entry/20060803/p1\r
+               // Safari2.0.4では標準・互換どちらも document.body           \r
+                       return [\r
+                               X.Dom._root.scrollWidth  || X.Dom._root.offsetWidth,\r
+                               X.Dom._root.scrollHeight || X.Dom._root.offsetHeight\r
+                       ];\r
+               },\r
+               \r
+               getScrollPosition :\r
+                       window.pageXOffset !== undefined ?\r
+                               new Function( 'return[window.pageXOffset,window.pageYOffset]' ) :\r
+                       window.scrollLeft  !== undefined ?\r
+                               new Function( 'return[window.scrollLeft,window.scrollTop]') :\r
+                               new Function( 'return[X.Dom._root.scrollLeft,X.Dom._root.scrollTop]' ),\r
 \r
-                               return X.Callback.UN_LISTEN;\r
-                       },\r
+               getScrollbarSize : function(){\r
+                       return [ X.Dom.BoxModel.vScrollbarSize, X.Dom.BoxModel.hScrollbarSize ];        \r
+               }               \r
+       }\r
+);\r
 \r
-                       handleEvent : function( e ){\r
-                               switch( e.type ){\r
-                                       case 'beforeunload' :\r
-                                               // ie では a href="javascript" な要素でも beforeunload が起こる\r
-                                               return X.Dom.dispatch( { type : X.Dom.Event.BEFORE_UNLOAD } );\r
-                                       case 'unload' :\r
-                                               X.Dom.dispatch( { type : X.Dom.Event.UNLOAD } );\r
-                                               \r
-                                               Node._window.unlisten();\r
-                                               Node._document.unlisten();\r
-                                               Node._html._actualRemove( true );\r
-                                               break;\r
-                                       case 'visibilitychange' :\r
-                                               X.Dom.dispatch( { type : document[ 'hidden' ] ? X.Dom.Event.VIEW_DEACTIVATE : X.Dom.Event.VIEW_ACTIVATE } );\r
-                                               break;\r
-                                       case 'webkitvisibilitychange' :\r
-                                               X.Dom.dispatch( { type : document[ 'webkitHidden' ] ? X.Dom.Event.VIEW_DEACTIVATE : X.Dom.Event.VIEW_ACTIVATE } );\r
-                                               break;\r
-                                       case 'pageshow' :\r
-                                       case 'focus' :\r
-                                               X.Dom.dispatch( { type : X.Dom.Event.VIEW_ACTIVATE } );\r
-                                               break;\r
-                                       case 'pagehide' :\r
-                                       case 'blur' :\r
-                                               X.Dom.dispatch( { type : X.Dom.Event.VIEW_DEACTIVATE } );\r
-                                               break;\r
-                               };\r
-                       },\r
+if( !X.UA.IE || 9 <= X.UA.IE ){\r
+       X.Dom._detectFontSize = function(){\r
+               var size = Node._fontSizeNode._rawNode.offsetHeight;\r
+               if( X.Dom.baseFontSize !== size ){\r
+                       X.Dom.baseFontSize && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.BASE_FONT_RESIZED, size : size } );\r
+                       X.Dom.baseFontSize = size;\r
+               };\r
+       };\r
+};\r
 \r
-                       getSize :\r
-                               X.UA.IE ?\r
-                                       new Function( 'return[X.Dom._root.clientWidth,X.Dom._root.clientHeight]' ) :\r
-                                       new Function( 'return[window.innerWidth,window.innerHeight]' ),\r
-       //https://developer.mozilla.org/en-US/docs/Web/API/Element.getBoundingClientRect\r
-       //use window.pageXOffset and window.pageYOffset instead of window.scrollX and window.scrollY\r
-       //(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollLeft == 'number' ? t : document.body).ScrollLeft;\r
-       //(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollTop == 'number' ? t : document.body).ScrollTop\r
-                       \r
-                       getScrollPosition :\r
-                               window.pageXOffset !== undefined ?\r
-                                       new Function( 'return[window.pageXOffset,window.pageYOffset]' ) :\r
-                               window.scrollLeft  !== undefined ?\r
-                                       new Function( 'return[window.scrollLeft,window.scrollTop]') :\r
-                                       new Function( 'return[X.Dom._root.scrollLeft,X.Dom._root.scrollTop]' ),\r
-                       getDocumentSize : function(){\r
-                               // Opera は互換モードでは document.body.scrollHeight、標準モードでは document.documentElement.scrollHeight でページの高さが取れる。と思ってたんだけど、例外があった。\r
-                               // http://orera.g.hatena.ne.jp/edvakf/20100515/1273908051\r
-                       //http://onozaty.hatenablog.com/entry/20060803/p1\r
-                       // Safari2.0.4では標準・互換どちらも document.body           \r
-                               return [\r
-                                       X.Dom._root.scrollWidth  || X.Dom._root.offsetWidth,\r
-                                       X.Dom._root.scrollHeight || X.Dom._root.offsetHeight\r
-                               ];\r
-                       },\r
-                       // todo\r
-                       getScrollbarSize : function(){\r
-                               return [];      \r
-                       }\r
-               }\r
-       );\r
 \r
-})( window, document );\r
 \r
-X.Dom.cleanupTagNames     = 'noscript,noframes,comment,!,noembed,nolayer'.split( ',' );\r
+X.Dom.cleanupTagNames = {\r
+               noscript : 1,\r
+               noframes : 1,\r
+               '!'      : 1,\r
+               noembed  : 1,\r
+               nolayer  : 1\r
+       };\r
 X.Dom.skipCleanupTagNames = 'pre,textarea,code,kbd,samp,xmp,plaintext,listing'.split( ',' );\r
                \r
 X.Dom.cleanupWhiteSpace = function( text ){\r
index 589db76..f544a3c 100644 (file)
@@ -63,6 +63,8 @@ X.Dom.Node = X.EventDispatcher.inherits(
                _css       : null, // X.Dom.Style\r
                _cssText   : null,\r
                \r
+               _fontSize  : 0,\r
+               \r
                _anime     : null,\r
                \r
                Constructor : function( v ){\r
@@ -882,6 +884,7 @@ 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
@@ -928,6 +931,8 @@ 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
index b567484..019cb67 100644 (file)
@@ -34,7 +34,6 @@ X.Dom.Style = {
        PropNo : {},
        
        UNIT : {
-               // '' : 0,
                'px'   : 0,
                'em'   : 1,
                'cm'   : 2,
@@ -254,6 +253,64 @@ _GRNERAL
                LEMONCHIFFON  : 0xFFFACD
        },
        
+       parseColor : function( x ){
+               var rgb, r, g, b;
+               
+               if( X.Type.isNumber( x ) ){
+                       return ( 0x0 <= x && x <= 0xFFFFFF ) ? x : undefined;
+               } else
+               if( !X.Type.isString( x ) ) return;
+               
+               if( X.Type.isNumber( rgb = X.Dom.Style.COLOR[ x.toUpperCase() ] ) && 0x0 <= rgb && rgb <= 0xFFFFFF ){
+                       return rgb;
+               } else
+               if( x.charAt( 0 ) === '#' ){
+                       switch( x.length ){
+                               case 7 :
+                                       r = parseInt( x.substr( 1, 2 ), 16 );
+                                       g = parseInt( x.substr( 3, 2 ), 16 );
+                                       b = parseInt( x.substr( 5, 2 ), 16 );
+                                       break;
+                               case 4 :
+                                       r = parseInt( x.charAt( 1 ) + x.charAt( 1 ), 16 );
+                                       g = parseInt( x.charAt( 2 ) + x.charAt( 2 ), 16 );
+                                       b = parseInt( x.charAt( 3 ) + x.charAt( 3 ), 16 );
+                                       break;
+                               case 2 :
+                                       r = g = b = parseInt( x.charAt( 1 ) + x.charAt( 1 ), 16 );
+                                       break;
+                               default :
+                                       return;                                                                                 
+                       };
+               } else
+               if( x.indexOf( 'rgb(' ) === 0 ){
+                       rgb = x.substr( 4 ).split( ',' );
+                       r = parseFloat( rgb[ 0 ] );
+                       g = parseFloat( rgb[ 1 ] );
+                       b = parseFloat( rgb[ 2 ] );
+                       if( x.indexOf( '%' ) !== -1 ){
+                               r *= 2.55;
+                               g *= 2.55;
+                               b *= 2.55;
+                       };
+               } else
+               if( x.indexOf( 'rgba(' ) === 0 ){
+                       rgb = x.substr( 5 ).split( ',' );
+                       r = parseFloat( rgb[ 0 ] );
+                       g = parseFloat( rgb[ 1 ] );
+                       b = parseFloat( rgb[ 2 ] );
+                       //a = parseFloat( rgb[ 3 ] );
+                       if( x.indexOf( '%' ) !== -1 ){
+                               r *= 2.55;
+                               g *= 2.55;
+                               b *= 2.55;
+                       };
+               } else {
+                       return undefined;
+               };
+               return isFinite( r + b + g ) ? ( r << 16 ) + ( g << 8 ) + b : undefined;
+       },
+       
        PARAMS : ( function(){
                var ret = {};
                register( ret.percent = {},
@@ -640,7 +697,7 @@ _GRNERAL
                                        _1  = all[ 1 ];
                                        _2  = all[ 2 ];
                                        _3  = all[ 3 ];
-                                       vu  = XDomStyle._Util._splitValueAndUnit( _0 );
+                                       vu  = XDomStyle._splitValueAndUnit( _0 );
                                        v   = vu[ 0 ];
                                        u   = vu[ 1 ];
                                        switch( all.length ){
@@ -653,7 +710,7 @@ _GRNERAL
                                                case 2 :
                                                        top    = new Property( props[ 0 ], v, u, xnode );
                                                        bottom = new Property( props[ 2 ], v, u, xnode );
-                                                       vu     = XDomStyle._Util._splitValueAndUnit( _1 );
+                                                       vu     = XDomStyle._splitValueAndUnit( _1 );
                                                        v      = vu[ 0 ];
                                                        u      = vu[ 1 ];
                                                        right  = new Property( props[ 1 ], v, u, xnode );
@@ -661,27 +718,27 @@ _GRNERAL
                                                        break;
                                                case 3 :
                                                        top    = new Property( props[ 0 ], v, u, xnode );
-                                                       vu     = XDomStyle._Util._splitValueAndUnit( _1 );
+                                                       vu     = XDomStyle._splitValueAndUnit( _1 );
                                                        v      = vu[ 0 ];
                                                        u      = vu[ 1 ];
                                                        right  = new Property( props[ 1 ], v, u, xnode );
                                                        left   = new Property( props[ 3 ], v, u, xnode );
-                                                       vu     = XDomStyle._Util._splitValueAndUnit( _2 );
+                                                       vu     = XDomStyle._splitValueAndUnit( _2 );
                                                        v      = vu[ 0 ];
                                                        u      = vu[ 1 ];
                                                        bottom = new Property( props[ 2 ], v, u, xnode );
                                                        break;
                                                case 4 :
                                                        top    = new Property( props[ 0 ], v, u, xnode );
-                                                       vu     = XDomStyle._Util._splitValueAndUnit( _1 );
+                                                       vu     = XDomStyle._splitValueAndUnit( _1 );
                                                        v      = vu[ 0 ];
                                                        u      = vu[ 1 ];
                                                        right  = new Property( props[ 1 ], v, u, xnode );
-                                                       vu     = XDomStyle._Util._splitValueAndUnit( _2 );
+                                                       vu     = XDomStyle._splitValueAndUnit( _2 );
                                                        v      = vu[ 0 ];
                                                        u      = vu[ 1 ];
                                                        bottom = new Property( props[ 2 ], v,u, xnode );
-                                                       vu     = XDomStyle._Util._splitValueAndUnit( _3 );
+                                                       vu     = XDomStyle._splitValueAndUnit( _3 );
                                                        v      = vu[ 0 ];
                                                        u      = vu[ 1 ];
                                                        left   = new Property( props[ 3 ], v, u, xnode );
@@ -738,8 +795,8 @@ _GRNERAL
                                        if( ret.isValid() === true ) return ret;
                                        ret.kill();
                                        xy = css[ p ].split( ' ' );
-                                       x  = XDomStyle._Util._splitValueAndUnit( xy[ 0 ] );
-                                       y  = XDomStyle._Util._splitValueAndUnit( xy[ 1 ] );
+                                       x  = XDomStyle._splitValueAndUnit( xy[ 0 ] );
+                                       y  = XDomStyle._splitValueAndUnit( xy[ 1 ] );
                                        return
                                                new PropertyGroup(
                                                        p,
@@ -748,7 +805,7 @@ _GRNERAL
                                                );
                        };
                        // opacity, zindex, lineHeight
-                       vu = XDomStyle._Util._splitValueAndUnit( css[ p ] );
+                       vu = XDomStyle._splitValueAndUnit( css[ p ] );
                        return new Property( p, vu[ 0 ], vu[ 1 ], xnode );
                };
                var x = css[ p ], e, v, u;
@@ -771,44 +828,21 @@ _GRNERAL
                        return new Property( p, v, 'px', xnode );
                };
                if( PARAMS.offset[ p ] || PARAMS.percent[ p ] || PARAMS.size[ p ] ){
-                       vu = XDomStyle._Util._splitValueAndUnit( x );
+                       vu = XDomStyle._splitValueAndUnit( x );
                        return new Property( p, vu[ 0 ], vu[ 1 ], xnode );
                };
 
                if( PARAMS.color[ p ] ) return new ColorProperty( p, x );
        },
        
-       _Util : {
-               /*
-               getValue: function( x ){
-                       return X.Type.isString( x ) ? parseInt( x ) :
-                              X.Type.isNumber( x ) ? x : 0;
-               },
-               getUnit: function( x, p ){
-                       
-
-       var REG_UINIT      = /.*\d(\w{1,2})?/,
-               $1             = '$1',
-
-                       
-                       var u;
-                       if( X.Type.isString( x ) === true ){
-                               u = x.replace( REG_UINIT, $1 );
-                               if( p === 'lineHeight' ) return u;
-                               if( PARAMS.unit[ u ] !== true ) return 'px';
-                               return u;
-                       };
-                       return 'px';
-               }, */
-               _splitValueAndUnit : function( v ){
-                       var num, _num, i, u;
-                       if( X.Type.isNumber( v ) ) return [ v || 0, '' ];
-                       if( isNaN( num = parseInt( v ) ) ) return [ 0, '' ];
-                       _num = '' + num;
-                       i = v.indexOf( _num ) + _num.length;
-                       u = v.substr( i );
-                       return [ num, X.Dom.Style.UNIT[ u ] ? u : 'px' ];
-               }               
+       _splitValueAndUnit : function( v ){
+               var num, _num, u;
+               if( X.Type.isNumber( v ) ) return [ v || 0, '' ];
+               if( isNaN( num = parseFloat( v ) ) ) return [ 0, '' ];
+               _num = '' + num;
+               if( _num.indexOf( '0.' ) === 0 ) _num = _num.slice( 1 );
+               u = v.substr( v.indexOf( _num ) + _num.length );
+               return [ num, X.Dom.Style.UNIT[ u ] ? u : 'px' ];
        }
 };
 
@@ -976,8 +1010,8 @@ X.Dom.Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */
                return this;
        } else
        if( 1 < args.length ){
-               if( !( unit = XDomStyle.UNIT[ nameOrObj ] ) ){
-// setter name, value                  
+               if( !XDomStyle.UNIT[ nameOrObj ] ){
+// setter name, value
                        if( !css ) css = this._css = {};
                        name = XDomStyle.camelize( nameOrObj );
                        v    = args[ 1 ];
@@ -1004,8 +1038,8 @@ X.Dom.Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */
 // unit 付の値取得は fontSize と 画像サイズが確定していないと正確に取れない。内部のみにする?
                if( !css ) return;
                if( !XDomStyle._GET_VALUE_WITH_UNIT[ name = XDomStyle.camelize( args[ 1 ] ) ] ) return null;
-               p = XDomStyle._getProperty( this, css, unit, name );
-               v = p.pxTo( unit );
+               p = XDomStyle._getProperty( this, css, nameOrObj, name );
+               v = p.pxTo( nameOrObj );
                p.kill();
                return v;
        };
@@ -1047,69 +1081,114 @@ X.Dom.Node.prototype.cssText = function( v ){
 /*
  * ここでは HTMLElement のチャックは行わない!
  */
+
 X.Dom.Node.prototype._getCharSize =
        window.getComputedStyle ?
                (function(){
-                       return parseInt( getComputedStyle( this._rawNode, null ).fontSize );
+                       if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize;
+                       Node.root._updateTimerID && Node.root._startUpdate();
+                       if( this._fontSize ) return this._fontSize;
+                       return this._fontSize = parseFloat( getComputedStyle( this._rawNode, null ).fontSize );
                }) :
        document.defaultView && document.defaultView.getComputedStyle ?
                (function(){
-                       return parseInt( document.defaultView.getComputedStyle( this._rawNode, null ).fontSize );
+                       if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize;
+                       Node.root._updateTimerID && Node.root._startUpdate();
+                       if( this._fontSize ) return this._fontSize;
+                       return this._fontSize = parseFloat( document.defaultView.getComputedStyle( this._rawNode, null ).fontSize );
                }) :
        X.UA.IE && 5.5 <= X.UA.IE ?
                (function(){
-                       if( this === Node.root && X.Dom.Event._lastFontSize ) return X.Dom.Event._lastFontSize;
-                       var font = this._rawNode.currentStyle.fontSize,
-                               vu   = X.Dom.Style._Util._splitValueAndUnit( font ),
-                               v    = vu[ 0 ],
-                               u    = vu[ 1 ],
-                               elm;    
+                       var font, vu, v, u, _v;
+                       if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize;
+                       Node.root._updateTimerID && Node.root._startUpdate();
+                       if( this._fontSize ) return this._fontSize;
+                       
+                       font = this._rawNode.currentStyle.fontSize;
+                       //font = this._css && this._css.fontSize || '1em';
+                       vu   = X.Dom.Style._splitValueAndUnit( font );
+                       v    = vu[ 0 ];
+                       u    = vu[ 1 ];
+
                        if( v === 0 ){
-                               if( v = X.Dom.Style._FONT_SIZE_RATIO[ font ] ) return v;
+                               if( v = X.Dom.Style._FONT_SIZE_RATIO[ font ] ) return this._fontSize = v;
                        } else {
-                               if( u = X.Dom.Style._UNIT_RATIO[ u ] ) return v / u;
+                               if( _v = X.Dom.Style._UNIT_RATIO[ u ] ) return this._fontSize = v / _v;
                        };
                        switch( u ){
                                case 'px' :
-                                       return v;
+                                       return this._fontSize = v;
                                case 'em' :
                                // body まで辿ってしまった場合は?
-                                       if( this.parent ) return this.parent._getCharSize() * v;
+                                       if( this.parent ) return this._fontSize = this.parent._getCharSize() * v;
                                        break;
                                case '%' :
                                // body まで辿ってしまった場合は?
-                                       if( this.parent ) return this.parent._getCharSize() * v / 100;
-                                       break;
+                                       if( this.parent ) return this._fontSize = this.parent._getCharSize() * v / 100;
                        };
-                       elm = document.createElement( 'div' );
-                       Node._systemNode._rawNode.appendChild( elm );
-                       elm.style.cssText = 'position:absolute;top:0;left:0;overflow:hidden;line-height:1;height:1em;';
-                       elm.innerText = 'X';
-                       v = elm.offsetHeight;
-                       Node._systemNode._rawNode.removeChild( elm );
-                       return v;
+                       return 0;
                }) :
        document.getElementById ?
                (function(){
-                       var elm = document.createElement( 'span' ),
-                               v;
-                       this._rawNode.appendChild( elm );
+                       var elm, v;
+                       if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize;
+                       Node.root._updateTimerID && Node.root._startUpdate();
+                       if( this._fontSize ) return this._fontSize;
+
+                       this._rawNode.appendChild( elm = document.createElement( 'span' ) );
                        elm.style.cssText = 'display:block;position:absolute;top:0;left:0;visivility:hidden;line-height:1;height:1em;';
-                       elm.innerHTML = 'X';                    
+                       elm.innerHTML = 'X';
                        v = elm.offsetHeight;
                        this._rawNode.removeChild( elm );
-                       return v;
+                       return this._fontSize = v;
                }) :
        X.UA.IE ?
                (function(){
-                       var elm = this._rawNode || this._ie4getRawNode(), v;
+                       var font, vu, v, u, _v;
+                       if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize;
+                       Node.root._updateTimerID && Node.root._startUpdate();
+                       if( this._fontSize ) return this._fontSize;
+                       
+                       if( this._css && ( font = this._css.fontSize ) ){
+                               vu = X.Dom.Style._splitValueAndUnit( font );
+                               v  = vu[ 0 ];
+                               u  = vu[ 1 ];
+                               
+                               if( v === 0 ){
+                                       if( _v = X.Dom.Style._FONT_SIZE_RATIO[ font ] ) return this._fontSize = _v;
+                               } else {
+                                       if( _v = X.Dom.Style._UNIT_RATIO[ u ] ) return this._fontSize = v / _v;
+                               };
+                       } else {
+                               v = 1;
+                               u = 'em';
+                       };
+
+                       switch( u ){
+                               case 'px' :
+                                       return this._fontSize = v;
+                               case 'em' :
+                               // body まで辿ってしまった場合は?
+                                       if( this.parent ) return this._fontSize = this.parent._getCharSize() * v;
+                                       break;
+                               case '%' :
+                               // body まで辿ってしまった場合は?
+                                       if( this.parent ) return this._fontSize = this.parent._getCharSize() * v / 100;
+                       };
+                       return 0;
+               }) :
+               (function(){
+                       var elm, v;
+                       if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize;
+                       Node.root._updateTimerID && Node.root._startUpdate();
+                       if( this._fontSize ) return this._fontSize;
+                       
+                       elm = this._rawNode || this._ie4getRawNode();
                        elm.insertAdjacentHTML( 'BeforeEnd', '<span style="visivility:hidden;line-height:1;">X</span>' );
                        elm = elm.children[ elm.children.length - 1 ];
                        v   = elm.offsetHeight;
                        elm.outerHTML = '';
-                       return v * 0.75;
-               }) :
-               (function(){
+                       return this._fontSize = v * 0.75;
                });
 
 
@@ -1178,7 +1257,7 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT, function(){
 X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){
        var xnode  = Node._systemNode,
                output = X.Dom.Style._UNIT_RATIO = {},
-               list   = 'em,cm,mm,in,pt,pc'.split( ',' ),
+               list   = 'cm,mm,in,pt,pc'.split( ',' ),
                unit,size, base, i;
        
        for( i = list.length; i; ){
index a067ce4..b384393 100644 (file)
@@ -23,7 +23,7 @@ X.Dom.Parser = {
        closeSelf : {colgroup:1,dd:1,dt:1,li:1,options:1,p:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}, // add tbody\r
 \r
        // todo:\r
-       plainText : { plaintext : 1, xmp : 1 },\r
+       plainText : { plaintext : 1, xmp : 1, textarea : 1 },\r
 \r
        sisters : {\r
                th : { td : 1 },\r
@@ -47,10 +47,11 @@ X.Dom.Parser = {
        fillAttrs : X.Dom.Attr.noValue, //{checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};\r
 \r
        // Special Elements (can contain anything)\r
-       special : {script:1,style:1},\r
+       special : {script:1,style:1,plaintext : 1, xmp : 1, textarea : 1},\r
        \r
        exec : function( html, handler, async ){\r
                var special        = X.Dom.Parser.special,\r
+                       plainText      = X.Dom.Parser.plainText,\r
                        startTime      = async && X.getTime(),\r
                        _parseStartTag = X.Dom.Parser._parseStartTag,\r
                        _parseEndTag   = X.Dom.Parser._parseEndTag,\r
@@ -64,9 +65,17 @@ X.Dom.Parser = {
                        \r
                        // Make sure we're not in a script or style element\r
                        if ( last && special[ last.toLowerCase() ] === 1 ) {\r
-                               if( 0 <= ( index = _parseEndTag( stack, handler, html ) ) ){\r
-                                       //handler.chars( html.substring( 0, index ) );\r
-                                       html = html.substring( index );\r
+                               if( 0 <= ( index = html.toLowerCase().indexOf( '</' + last.toLowerCase() ) ) ){\r
+                                       handler.chars( html.substring( 0, index ) );\r
+                                       if( index = _parseEndTag( stack, handler, html ) ){\r
+                                               html = html.substring( index );\r
+                                       } else {\r
+                                               handler.chars( html );\r
+                                               html = '';\r
+                                       };\r
+                               } else {\r
+                                       handler.chars( html );\r
+                                       html = '';\r
                                };\r
                        } else {\r
                                // Comment\r
@@ -226,7 +235,7 @@ X.Dom.Parser = {
                                        ( chr === '>' ) && ( phase = 9 );\r
                                        ( phase !== 2 ) && ( tagName = html.substring( start, i ) );\r
                                        break;\r
-                               case 3 : // 属性名の開始を待つ\r
+                               case 3 : // タグの終了を待つ\r
                                        chr === '>' && ( phase = 9 );\r
                                        break;\r
                        };\r
index de453f1..ad5e44f 100644 (file)
@@ -220,7 +220,7 @@ bindElementToXnode =
                                                        xnode.attr( 'value', xnode.html() ).empty();\r
                                                        current.xtext = null;\r
                                                } else\r
-                                               if( 0 <= X.Dom.cleanupTagNames.indexOf( tag.toLowerCase() ) || tag === 'SCRIPT' ){ // ie で body 内の script が2度よばれるのに対処\r
+                                               if( !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag.toLowerCase() ] || tag === 'SCRIPT' || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
                                                        //alert( '[' +parent._tag + '>' + xnode._tag + '] remove ... ' );\r
                                                        xnode.destroy();\r
                                                } else\r
@@ -340,7 +340,7 @@ bindElementToXnode =
                                        xnode._rawNode = elm;\r
                                        xnode._root    = parent._root;\r
                                        //xnode._tag     = X.Dom.DTD.TAG_FIX[ tag ] || tag;\r
-                                       if( 0 <= X.Dom.cleanupTagNames.indexOf( tag.toLowerCase() ) || tag === 'SCRIPT' ){\r
+                                       if( !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag.toLowerCase() ] || tag === 'SCRIPT' || xnode.hasClass( 'cleanup-target' ) ) ){\r
                                                xnode.destroy();\r
                                                break;\r
                                        };\r