OSDN Git Service

version 0.6.100, X.ViewPort working.
authoritozyun <itozyun@user.sourceforge.jp>
Mon, 13 Oct 2014 02:43:57 +0000 (11:43 +0900)
committeritozyun <itozyun@user.sourceforge.jp>
Mon, 13 Oct 2014 02:43:57 +0000 (11:43 +0900)
14 files changed:
0.6.x/js/01_core/12_XEvent.js
0.6.x/js/01_core/15_XSystem.js
0.6.x/js/01_core/16_XViewPort.js
0.6.x/js/01_core/17_XLogger.js
0.6.x/js/02_dom/01_XDomDTD.js
0.6.x/js/02_dom/02_XDomNode.js
0.6.x/js/02_dom/03_XDomEvent.js
0.6.x/js/02_dom/04_XDomBoxModel.js
0.6.x/js/02_dom/06_XDomStyle.js
0.6.x/js/02_dom/07_XDomNodeList.js
0.6.x/js/02_dom/08_XDomSelector.js
0.6.x/js/02_dom/22_XDomBuilder.js
0.6.x/js/04_util/01_XNinjaIframe.js
0.6.x/js/20_ui/20_PageRoot.js

index 758fb1a..36e8130 100644 (file)
@@ -42,12 +42,32 @@ X.Event = {
        BEFORE_CANCEL          : 10,\r
        CANCELED               : 11,\r
        TIMEOUT                : 12,\r
+       \r
        BEFORE_KILL_INSTANCE   : 13,\r
        KILL_INSTANCE_CANCELED : 14,    \r
-       KILL_INSTANCE          : 15\r
+       KILL_INSTANCE          : 15,\r
+\r
+       VIEW_ACTIVATE          : 16,\r
+       VIEW_DEACTIVATE        : 17,\r
+       VIEW_RESIZED           : 18,\r
+       VIEW_TURNED            : 19,\r
+       BASE_FONT_RESIZED      : 20,\r
+// in_page_jump\r
+// on_screen_keyboard_show\r
+// on_screen_keyboard_hide\r
+// X.Event.BEFORE_UPDATE       = ++X_Event_last; // このイベントで要素のサイズを取得すると無限ループに!\r
+       AFTER_UPDATE           : 21,\r
+// hash_change\r
+       BEFORE_UNLOAD          : 22,\r
+       UNLOAD                 : 23,\r
+       \r
+       BACKEND_READY          : 24,\r
+       BACKEND_NOT_FOUND      : 25,\r
+       BACKEND_RESEARCH       : 26,\r
+       BACKEND_CHANGED        : 27\r
 };\r
 \r
-X_Event_last = 15;\r
+X_Event_last = 27;\r
 \r
 X_TEMP.onSystemReady.push(\r
        function(){\r
index fbb8fe0..77df8aa 100644 (file)
@@ -13,13 +13,16 @@ var X_System = X.Class._override(
        }\r
 );\r
 \r
+// beforeunload\r
+// unload\r
+\r
 X_TEMP.onRearchEndOfScript = function(){\r
-       var cbs = X_TEMP.onSystemReady,\r
-               i = cbs.length;\r
+       var callbacks = X_TEMP.onSystemReady,\r
+               i = callbacks.length;\r
        delete X_TEMP.onRearchEndOfScript;\r
        delete X_TEMP.onSystemReady;\r
        \r
        for( ; i; ){\r
-               cbs[ --i ]( X_System );\r
+               callbacks[ --i ]( X_System );\r
        };\r
 };
\ No newline at end of file
index 39c5483..226bf4f 100644 (file)
-\r
-var X_Dom_readyState,\r
-       X_Dom_active = !!window.parent || !!document.activeElement, // parent は frameに読み込まれた場合のieのerror回避\r
-       X_Dom_rootElement,\r
-       X_Dom_lock,\r
-       X_Dom_width,\r
-       X_Dom_height,\r
-       X_Dom_baseFontSize,\r
-       X_Dom_orientationFlag;\r
-\r
-X.Dom = X.Class._override(\r
-       new X.EventDispatcher(),\r
-       {\r
-\r
-               handleEvent : function( e ){\r
-                       var href;\r
-                       switch( e.type ){\r
-                               case 'beforeunload' :\r
-                                       \r
-                                       // ie では a href="javascript" な要素でも beforeunload が起こる\r
-                                       href = e.target && e.target.attr && e.target.attr( 'href' );\r
-                                       if( href && href.indexOf && href.indexOf( 'javascript:' ) === 0 ) return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;\r
-                                       \r
-                                       return X.Dom.dispatch( X.Dom.Event.BEFORE_UNLOAD );\r
-                               case 'unload' :\r
-                                       X.Dom.dispatch( 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_active = document[ 'hidden' ] ) ? X.Dom.Event.VIEW_DEACTIVATE : X.Dom.Event.VIEW_ACTIVATE } );\r
-                                       break;\r
-                               case 'webkitvisibilitychange' :\r
-                                       X.Dom.dispatch( { type : ( X_Dom_active = document[ 'webkitHidden' ] ) ? X.Dom.Event.VIEW_DEACTIVATE : X.Dom.Event.VIEW_ACTIVATE } );\r
-                                       break;\r
-                               case 'pageshow' :\r
-                               case 'focus' :\r
-                                       X_Dom_active = true;\r
-                                       X.Dom.dispatch( X.Dom.Event.VIEW_ACTIVATE );\r
-                                       break;\r
-                               case 'pagehide' :\r
-                               case 'blur' :\r
-                                       X_Dom_active = false;\r
-                                       X.Dom.dispatch( X.Dom.Event.VIEW_DEACTIVATE );\r
-                                       break;\r
-                       };\r
-               },\r
-\r
-               listen : function( type ){\r
-                       if( type <= X_Dom_readyState ){\r
-                               /*\r
-                                * X.Event.XDOM_READY 以後に listen した場合の対策\r
-                                */\r
-                               X.Dom.asyncDispatch( { type : type, w : X_Dom_width, h : X_Dom_height } );\r
-                       };\r
-                       return X_EventDispatcher_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
-               getSize : function(){\r
-                       return [ X_Dom_width, X_Dom_height ];\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
-                       \r
-                       Node._body._updateTimerID && Node._body._startUpdate();\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_rootElement.scrollWidth  || X_Dom_rootElement.offsetWidth,\r
-                               X_Dom_rootElement.scrollHeight || X_Dom_rootElement.offsetHeight\r
-                       ];\r
-               },\r
-               \r
-               getScrollPosition :\r
-                       window.pageXOffset !== undefined ?\r
-                               ( function(){\r
-                                       Node._body._updateTimerID && Node._body._startUpdate();\r
-                                       return[ window.pageXOffset, window.pageYOffset ];\r
-                               } ) :\r
-                       window.scrollLeft  !== undefined ?\r
-                               ( function(){\r
-                                       Node._body._updateTimerID && Node._body._startUpdate();\r
-                                       return[ window.scrollLeft, window.scrollTop ];\r
-                               } ) :\r
-                               ( function(){\r
-                                       Node._body._updateTimerID && Node._body._startUpdate();\r
-                                       // body は Safari2-\r
-                                       return[ X_Dom_rootElement.scrollLeft || document.body.scrollLeft, X_Dom_rootElement.scrollTop || document.body.scrollTop ];\r
-                               } ),\r
-\r
-               getScrollbarSize : function(){\r
-                       return [ X.Dom.BoxModel.vScrollbarSize, X.Dom.BoxModel.hScrollbarSize ];        \r
-               },\r
-               \r
-               getBaseFontSize : function(){\r
-                       if( Node._body._updateTimerID ){\r
-                               Node._body._startUpdate();\r
-                               return X_Dom_baseFontSize = Node._fontSizeNode._rawObject.offsetHeight;\r
-                       };\r
-                       return X_Dom_baseFontSize;\r
-               }\r
-       }\r
-);\r
-\r
-\r
-\r
-\r
-\r
-\r
-/* -----------------------------------------------\r
- * Resize\r
- *  original : uupaa.js\r
- * \r
- * TODO\r
- *  https://w3g.jp/blog/studies/ios7_1_minimal-ui_warning\r
- *  iOS7.0からあったiPad Safariの高さ100%コンテンツでlandscape(横向き)時に起きる不具合\r
- * \r
- * http://looxu.blogspot.jp/2013/11/ios7mobile-safariwindowinnerheight.html\r
- * iOS7にて、Mobile Safariのwindow.innerHeightを正しく取得する方法\r
- * \r
- *  http://tenderfeel.xsrv.jp/javascript/1182/\r
- *  アドレスバーの高さの算出\r
- * \r
- * http://sssslide.com/www.slideshare.net/hiroakiwakamatsu/javascript-14514208\r
- * 1. 傾き時の画面サイズ取得ー 対処方法の例\r
- * (1)ー? タイマーを使って、画面サイズ取得の タイミングを少しだけ遅延させる\r
- * window.onorientationchange = function() { setTimeout(function() { alert("W: " + window.innerWidth + ", H: " + window.innerHeight); }, 200); }\r
- * 横に傾けた時、正常に横向け時の 幅と高さが取得できている ただし、端末によってはうまく取得できな い場合がある(Galaxy S IIIとか・・・) 7 \r
- * \r
- * http://sssslide.com/www.slideshare.net/hiroakiwakamatsu/ss-12718639\r
- * \r
- * \r
- * getBoundingClientRect で fontsize の調査\r
- */\r
-               var X_Dom_resize =\r
-                       // iOS もループで回す,,,iOS3.1.3, iOS6 で確認\r
-                       X.UA.IE < 9 || X.UA.iOS ?\r
-                               (function(){\r
-                                       var size;\r
-                                       if( !X_Dom_lock ){\r
-                                               size = X_Dom_getWindowSize();\r
-                                               if( X_Dom_width !== size[ 0 ] || X_Dom_height !== size[ 1 ] ){\r
-                                                       X_Dom_width = size[ 0 ];\r
-                                                       X_Dom_height = size[ 1 ];\r
-                                                       X.Timer.once( 100, X_Dom_detectFinishResizing );\r
-                                                       X_Dom_lock = true;\r
-                                               };\r
-                                       };\r
-                                       \r
-                                       size = Node._fontSizeNode._rawObject.offsetHeight;\r
-                                       if( X_Dom_baseFontSize !== size ){\r
-                                               X_Dom_baseFontSize && X.Dom.asyncDispatch( { type : X.Dom.Event.BASE_FONT_RESIZED, fontSize : size, w : X_Dom_width, h : X_Dom_height  } );\r
-                                               X_Dom_baseFontSize = size;\r
-                                       };\r
-                                       \r
-                               }) :\r
-                               (function( e ){\r
-                                       console.log( '-- resize : ' + X_Timer_now() );\r
-                                       \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
-               function X_Dom_detectFinishResizing(){\r
-                       var size = X_Dom_getWindowSize();\r
-                       if( X_Dom_width !== size[ 0 ] || X_Dom_height !== size[ 1 ] ){\r
-                               X_Dom_width  = size[ 0 ];\r
-                               X_Dom_height = size[ 1 ];\r
-                               X.Timer.once( 100, X_Dom_detectFinishResizing );\r
-                       } else {\r
-                               console.log( '-- detectFinishResizing : ' + X_Timer_now() );\r
-                               \r
-                               X.Dom.asyncDispatch( { type : X.Dom.Event.VIEW_RESIZED, fontSize : X_Dom_baseFontSize, w : X_Dom_width, h : X_Dom_height } );\r
-                               X_Dom_lock = false;\r
-                               if( X_Dom_orientationFlag ){\r
-                                       X_Dom_orientationFlag = false;\r
-                                       X.Dom.asyncDispatch( 100, { type : X.Dom.Event.VIEW_TURNED, orientation : window.orientation } );\r
-                               };\r
-                       };\r
-               };\r
-\r
-               X_TEMP.onDomContentLoaded = function(){\r
-                       var s, size, elmHtml, elmHead, elmBody, html, head, body;\r
-                       \r
-                       if( X_TEMP.SYSTEM_EVENT_PRE_INIT <= X_Dom_readyState ) return X_Callback_UN_LISTEN;\r
-                       X_Dom_readyState = X_TEMP.SYSTEM_EVENT_PRE_INIT;\r
-                       \r
-                       // DOMContentLoaded の無いブラウザで X_TEMP.onDomContentLoaded への参照が残り続けるのを回避\r
-                       X_TEMP.onDomContentLoaded && Node._document.unlisten( 'DOMContentLoaded', X_TEMP.onDomContentLoaded );\r
-                       delete X_TEMP.onDomContentLoaded;\r
-                       \r
-                       elmHtml = document.documentElement ||\r
-                               X_UA_DOM.W3C ? document.getElementsByTagName( 'html' )[ 0 ] :\r
-                               X_UA_DOM.IE4 ? document.all.tags( 'html' )[ 0 ] : null;\r
-                       \r
-                       elmHead = \r
-                               X_UA_DOM.W3C ? document.getElementsByTagName( 'head' )[ 0 ] :\r
-                               X_UA_DOM.IE4 ? document.all.tags( 'head' )[ 0 ] : null;\r
-\r
-                       elmBody = document.body;\r
-\r
-                       X_Dom_rootElement = document.compatMode !== 'CSS1Compat' ? elmBody : elmHtml || elmBody;\r
-\r
-                       html = Node._html = elmHtml && new Node( elmHtml );\r
-               \r
-                       head = Node._head = elmHead && new Node( elmHead );\r
-               \r
-                       body = Node._body = new Node( elmBody );\r
-                       \r
-                       body._root   = html._root = head._root = body;// _root は html だろ\r
-                       body.parent  = head.parent = html;\r
-                       html._xnodes = [ head, body ];                  \r
-                       \r
-                       Node.root = body; // 後方互換\r
-                       \r
-                       html.appendTo = html.appendToRoot = html.before = html.after = html.clone = html.remove = html.destroy = html.prevNode = html.nextNode =\r
-                       html.create = html.createText = html.createAt = html.createTextAt = html.append = html.appendAt = html.empty = html.html = html.text =\r
-                       head.appendTo = head.appendToRoot = head.before = head.after = head.clone = head.remove = head.destroy = head.prevNode = head.nextNode =\r
-                       head.empty = head.html = head.text =\r
-                       body.appendTo = body.appendToRoot = body.before = body.after = body.clone = body.remove = body.destroy = body.prevNode = body.nextNode = new Function( 'return this' );\r
-\r
-                       X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT, function(){\r
-                               X_Dom_readyState = X_TEMP.SYSTEM_EVENT_XTREE;\r
-                               if( X_TEMP.X_Dom_useBuilder ) X_TEMP.X_Dom_useBuilder = !!document.body.children.length;\r
-                               !X_TEMP.X_Dom_useBuilder && X.Dom.asyncDispatch( X_TEMP.SYSTEM_EVENT_XTREE );\r
-                       } );\r
-                       \r
-                       X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_XTREE, function(){\r
-                               X_Dom_readyState = X_TEMP.SYSTEM_EVENT_INIT;\r
-                               //X.UA.Opera7 && alert( 'bc' );\r
-                               Node._body.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( X_TEMP.SYSTEM_EVENT_INIT );\r
-                       } );\r
-\r
-                       X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_INIT, function(){\r
-                               var size = X_Dom_getWindowSize();\r
-                               \r
-                               if( X_Dom_orientationchange ){\r
-                                       X.Dom.Node._window.listen( 'orientationchange', X_Dom_orientationchange );\r
-                               };\r
-                               \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
-                               \r
-                               X_Dom_baseFontSize = Node._fontSizeNode._rawObject.offsetHeight;\r
-                               \r
-                               X_Dom_readyState = X.Event.XDOM_READY;\r
-                               X.Dom.asyncDispatch( { type : X.Event.XDOM_READY, w : X_Dom_width = size[ 0 ], h : X_Dom_height = size[ 1 ] } );\r
-                       } );\r
-\r
-                       console.log( X.Dom.asyncDispatch( X_TEMP.SYSTEM_EVENT_PRE_INIT ) );     \r
-\r
-                       Node._window\r
-                               .listen( 'beforeunload', X.Dom )\r
-                               .listenOnce( 'unload', X.Dom );\r
-\r
-//ブラウザの戻るボタンで戻ったときに呼ばれるイベントとかキャッシュとかそこらへんのこと\r
-//http://d.hatena.ne.jp/koumiya/20080916/1221580149\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
-                                                       .listen( 'pagehide', X.Dom );   \r
-                       } else {\r
-                               Node._window.listen( 'focus', X.Dom )\r
-                                                       .listen( 'blur', X.Dom );\r
-                       };\r
-\r
-                       return X_Callback_UN_LISTEN;\r
-               };\r
-\r
-               function X_Dom_getWindowSize(){\r
-                       return X.UA.IE ?\r
-                               [ X_Dom_rootElement.clientWidth, X_Dom_rootElement.clientHeight ] :\r
-                               [ window.innerWidth, window.innerHeight ];\r
-               };\r
-\r
-\r
-if( !( X.UA.IE < 9 || X.UA.iOS ) ){\r
-       var X_Dom_detectFontSize = function(){\r
-               var size = Node._fontSizeNode._rawObject.offsetHeight;\r
-               if( X_Dom_baseFontSize !== size ){\r
-                       X_Dom_baseFontSize && X.Dom.asyncDispatch( { type : X.Dom.Event.BASE_FONT_RESIZED, fontSize : size, w : X_Dom_width, h : X_Dom_height } );\r
-                       X_Dom_baseFontSize = size;\r
-               };\r
-       };\r
-};\r
-\r
-if( window[ 'orientation' ] !== undefined ){\r
-       var X_Dom_orientationchange = function( e ){\r
-               X_Dom_orientationFlag = true;\r
-               !X.UA.Android && X_Dom_resize();\r
-               //console.log( '-- orientationchange : ' + X.Dom.getSize[ 0 ] + ' ' + X.Dom.getSize[ 1 ] );\r
-       },\r
-       X_Dom_orientationFlag;\r
-};\r
-\r
-console.log( 'X.Dom dom:w3c=' + X_UA_DOM.W3C + ' ev:w3c=' + X_UA_EVENT.W3C );\r
+
+var X_ViewPort_readyState,
+       X_ViewPort_active = !!window.parent || !!document.activeElement, // parent は frameに読み込まれた場合のieのerror回避
+       X_ViewPort_rootElement,
+       X_ViewPort_lock,
+       X_ViewPort_width,
+       X_ViewPort_height,
+       X_ViewPort_baseFontSize,
+       
+       X_Dom_detectFontSize = !( X.UA.IE < 9 || X.UA.iOS ) && function(){
+                       var size = Node._fontSizeNode._rawObject.offsetHeight;
+                       if( X_ViewPort_baseFontSize !== size ){
+                               X_ViewPort_baseFontSize && X_ViewPort.asyncDispatch( { type : X.Event.BASE_FONT_RESIZED, fontSize : size, w : X_ViewPort_width, h : X_ViewPort_height } );
+                               X_ViewPort_baseFontSize = size;
+                       };
+       },
+
+       X_ViewPort_orientationFlag,     
+       X_Dom_orientationchange = window[ 'orientation' ] !== undefined && function( e ){
+               X_ViewPort_orientationFlag = true;
+               !X.UA.Android && X_ViewPort_resize();
+               //console.log( '-- orientationchange : ' + X.ViewPort.getSize[ 0 ] + ' ' + X.ViewPort.getSize[ 1 ] );
+       };
+
+X_ViewPort = X.Class._override(
+       new X.EventDispatcher( window ),
+       {
+
+               handleEvent : function( e ){
+                       var href;
+                       switch( e.type ){
+                               case 'beforeunload' :
+                                       
+                                       // ie では a href="javascript" な要素でも beforeunload が起こる
+                                       href = e.target && e.target.attr && e.target.attr( 'href' );
+                                       if( href && href.indexOf && href.indexOf( 'javascript:' ) === 0 ) return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;
+                                       
+                                       return X_ViewPort.dispatch( X.Event.BEFORE_UNLOAD );
+                               case 'unload' :
+                                       X_ViewPort.dispatch( X.Event.UNLOAD );
+                                       
+                                       X.ViewPort.unlisten();
+                                       Node._document.unlisten();
+                                       Node._html._actualRemove( true );
+                                       break;
+                               case 'visibilitychange' :
+                                       X_ViewPort.dispatch( { type : ( X_ViewPort_active = document[ 'hidden' ] ) ? X.Event.VIEW_DEACTIVATE : X.Event.VIEW_ACTIVATE } );
+                                       break;
+                               case 'webkitvisibilitychange' :
+                                       X_ViewPort.dispatch( { type : ( X_ViewPort_active = document[ 'webkitHidden' ] ) ? X.Event.VIEW_DEACTIVATE : X.Event.VIEW_ACTIVATE } );
+                                       break;
+                               case 'pageshow' :
+                               case 'focus' :
+                                       X_ViewPort_active = true;
+                                       X_ViewPort.dispatch( X.Event.VIEW_ACTIVATE );
+                                       break;
+                               case 'pagehide' :
+                               case 'blur' :
+                                       X_ViewPort_active = false;
+                                       X_ViewPort.dispatch( X.Event.VIEW_DEACTIVATE );
+                                       break;
+                       };
+               }
+               
+       }
+);
+
+
+X.ViewPort = {
+       
+       listen : function( type, arg1, arg2, arg3 ){
+               if( type <= X_ViewPort_readyState ){
+                       /*
+                        * X.Event.XDOM_READY 以後に listen した場合の対策
+                        */
+                       X_ViewPort.asyncDispatch( { type : type, w : X_ViewPort_width, h : X_ViewPort_height } );
+               };
+               type && arg1 && X_ViewPort.listen( type, arg1, arg2, arg3 );
+               return X.ViewPort;
+       },
+       
+       
+       listenOnce : function( type, arg1, arg2, arg3 ){
+               if( type <= X_ViewPort_readyState ){
+                       /*
+                        * X.Event.XDOM_READY 以後に listen した場合の対策
+                        */
+                       X_ViewPort.asyncDispatch( { type : type, w : X_ViewPort_width, h : X_ViewPort_height } );
+               };
+               type && arg1 && X_ViewPort.listenOnce( type, arg1, arg2, arg3 );
+               return X.ViewPort;
+       },
+       
+       unlisten : function( type, arg1, arg2, arg3 ){
+               type && arg1 && X_ViewPort.unlisten( type, arg1, arg2, arg3 );
+               return X.ViewPort;
+       },
+       
+       listening : function( type, arg1, arg2, arg3 ){
+               return X_ViewPort.listening( type, arg1, arg2, arg3 );
+       },
+       
+       asyncDispatch : function(){
+               return X_ViewPort.asyncDispatch.apply( X_ViewPort, arguments );
+       },
+       
+       getPointerPosition : function(){
+               
+       },
+       
+       /* 要素が視界に入った  http://remysharp.com/2009/01/26/element-in-view-event-plugin/ */
+       inView : function( elm ){
+               
+       },
+       
+       getSize : function(){
+               return [ X_ViewPort_width, X_ViewPort_height ];
+       },
+//https://developer.mozilla.org/en-US/docs/Web/API/Element.getBoundingClientRect
+//use window.pageXOffset and window.pageYOffset instead of window.scrollX and window.scrollY
+//(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollLeft == 'number' ? t : document.body).ScrollLeft;
+//(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollTop == 'number' ? t : document.body).ScrollTop
+       
+       getDocumentSize : function(){
+               // Opera は互換モードでは document.body.scrollHeight、標準モードでは document.documentElement.scrollHeight でページの高さが取れる。と思ってたんだけど、例外があった。
+               // http://orera.g.hatena.ne.jp/edvakf/20100515/1273908051
+       //http://onozaty.hatenablog.com/entry/20060803/p1
+       // Safari2.0.4では標準・互換どちらも document.body
+               
+               Node._body._updateTimerID && Node._body._startUpdate();
+               /*X.UA.Opera ?
+                       ( document.documentElement && document.documentElement.clientWidth ?
+                               new Function( 'return[document.documentElement.clientWidth,document.documentElement.clientHeight]' ) :
+                               new Function( 'return[document.body.clientWidth,document.body.clientHeight]' )
+                       ) :*/                   
+               return [
+                       X_ViewPort_rootElement.scrollWidth  || X_ViewPort_rootElement.offsetWidth,
+                       X_ViewPort_rootElement.scrollHeight || X_ViewPort_rootElement.offsetHeight
+               ];
+       },
+       
+       getScrollPosition :
+               window.pageXOffset !== undefined ?
+                       ( function(){
+                               Node._body._updateTimerID && Node._body._startUpdate();
+                               return[ window.pageXOffset, window.pageYOffset ];
+                       } ) :
+               window.scrollLeft  !== undefined ?
+                       ( function(){
+                               Node._body._updateTimerID && Node._body._startUpdate();
+                               return[ window.scrollLeft, window.scrollTop ];
+                       } ) :
+                       ( function(){
+                               Node._body._updateTimerID && Node._body._startUpdate();
+                               // body は Safari2-
+                               return[ X_ViewPort_rootElement.scrollLeft || document.body.scrollLeft, X_ViewPort_rootElement.scrollTop || document.body.scrollTop ];
+                       } ),
+
+       getScrollbarSize : function(){
+               return [ X.Dom.BoxModel.vScrollbarSize, X.Dom.BoxModel.hScrollbarSize ];        
+       },
+       
+       getBaseFontSize : function(){
+               if( Node._body._updateTimerID ){
+                       Node._body._startUpdate();
+                       return X_ViewPort_baseFontSize = Node._fontSizeNode._rawObject.offsetHeight;
+               };
+               return X_ViewPort_baseFontSize;
+       }
+       
+};
+
+
+
+/* -----------------------------------------------
+ * Resize
+ *  original : uupaa.js
+ * 
+ * TODO
+ *  https://w3g.jp/blog/studies/ios7_1_minimal-ui_warning
+ *  iOS7.0からあったiPad Safariの高さ100%コンテンツでlandscape(横向き)時に起きる不具合
+ * 
+ * http://looxu.blogspot.jp/2013/11/ios7mobile-safariwindowinnerheight.html
+ * iOS7にて、Mobile Safariのwindow.innerHeightを正しく取得する方法
+ * 
+ *  http://tenderfeel.xsrv.jp/javascript/1182/
+ *  アドレスバーの高さの算出
+ * 
+ * http://sssslide.com/www.slideshare.net/hiroakiwakamatsu/javascript-14514208
+ * 1. 傾き時の画面サイズ取得ー 対処方法の例
+ * (1)ー? タイマーを使って、画面サイズ取得の タイミングを少しだけ遅延させる
+ * window.onorientationchange = function() { setTimeout(function() { alert("W: " + window.innerWidth + ", H: " + window.innerHeight); }, 200); }
+ * 横に傾けた時、正常に横向け時の 幅と高さが取得できている ただし、端末によってはうまく取得できな い場合がある(Galaxy S IIIとか・・・) 7 
+ * 
+ * http://sssslide.com/www.slideshare.net/hiroakiwakamatsu/ss-12718639
+ * 
+ * 
+ * getBoundingClientRect で fontsize の調査
+ */
+               var X_ViewPort_resize =
+                       // iOS もループで回す,,,iOS3.1.3, iOS6 で確認
+                       X.UA.IE < 9 || X.UA.iOS ?
+                               (function(){
+                                       var size;
+                                       if( !X_ViewPort_lock ){
+                                               size = X_ViewPort_getWindowSize();
+                                               if( X_ViewPort_width !== size[ 0 ] || X_ViewPort_height !== size[ 1 ] ){
+                                                       X_ViewPort_width = size[ 0 ];
+                                                       X_ViewPort_height = size[ 1 ];
+                                                       X.Timer.once( 100, X_Dom_detectFinishResizing );
+                                                       X_ViewPort_lock = true;
+                                               };
+                                       };
+                                       
+                                       size = Node._fontSizeNode._rawObject.offsetHeight;
+                                       if( X_ViewPort_baseFontSize !== size ){
+                                               X_ViewPort_baseFontSize && X_ViewPort.asyncDispatch( { type : X.Event.BASE_FONT_RESIZED, fontSize : size, w : X_ViewPort_width, h : X_ViewPort_height  } );
+                                               X_ViewPort_baseFontSize = size;
+                                       };
+                                       
+                               }) :
+                               (function( e ){
+                                       console.log( '-- resize : ' + X_Timer_now() );
+                                       
+                                       !X_ViewPort_lock && ( X_ViewPort_lock = true ) && X.Timer.once( 100, X_Dom_detectFinishResizing );
+                                       return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;
+                               });
+               
+               function X_Dom_detectFinishResizing(){
+                       var size = X_ViewPort_getWindowSize();
+                       if( X_ViewPort_width !== size[ 0 ] || X_ViewPort_height !== size[ 1 ] ){
+                               X_ViewPort_width  = size[ 0 ];
+                               X_ViewPort_height = size[ 1 ];
+                               X.Timer.once( 100, X_Dom_detectFinishResizing );
+                       } else {
+                               console.log( '-- detectFinishResizing : ' + X_Timer_now() );
+                               
+                               X_ViewPort.asyncDispatch( { type : X.Event.VIEW_RESIZED, fontSize : X_ViewPort_baseFontSize, w : X_ViewPort_width, h : X_ViewPort_height } );
+                               X_ViewPort_lock = false;
+                               if( X_ViewPort_orientationFlag ){
+                                       X_ViewPort_orientationFlag = false;
+                                       X_ViewPort.asyncDispatch( 100, { type : X.Event.VIEW_TURNED, orientation : window.orientation } );
+                               };
+                       };
+               };
+
+               X_TEMP.onDomContentLoaded = function(){
+                       var s, size, elmHtml, elmHead, elmBody, html, head, body;
+                       
+                       if( X_TEMP.SYSTEM_EVENT_PRE_INIT <= X_ViewPort_readyState ) return X_Callback_UN_LISTEN;
+                       X_ViewPort_readyState = X_TEMP.SYSTEM_EVENT_PRE_INIT;
+                       
+                       // DOMContentLoaded の無いブラウザで X_TEMP.onDomContentLoaded への参照が残り続けるのを回避
+                       X_TEMP.onDomContentLoaded && Node._document.unlisten( 'DOMContentLoaded', X_TEMP.onDomContentLoaded );
+                       delete X_TEMP.onDomContentLoaded;
+                       
+                       elmHtml = document.documentElement ||
+                               X_UA_DOM.W3C ? document.getElementsByTagName( 'html' )[ 0 ] :
+                               X_UA_DOM.IE4 ? document.all.tags( 'html' )[ 0 ] : null;
+                       
+                       elmHead = 
+                               X_UA_DOM.W3C ? document.getElementsByTagName( 'head' )[ 0 ] :
+                               X_UA_DOM.IE4 ? document.all.tags( 'head' )[ 0 ] : null;
+
+                       elmBody = document.body;
+
+                       X_ViewPort_rootElement = document.compatMode !== 'CSS1Compat' ? elmBody : elmHtml || elmBody;
+
+                       html = Node._html = elmHtml && new Node( elmHtml );
+               
+                       head = Node._head = elmHead && new Node( elmHead );
+               
+                       body = Node._body = new Node( elmBody );
+                       
+                       body._root   = html._root = head._root = body;// _root は html だろ
+                       body.parent  = head.parent = html;
+                       html._xnodes = [ head, body ];                  
+                       
+                       Node.root = body; // 後方互換
+                       
+                       html.appendTo = html.appendToRoot = html.before = html.after = html.clone = html.remove = html.destroy = html.prevNode = html.nextNode =
+                       html.create = html.createText = html.createAt = html.createTextAt = html.append = html.appendAt = html.empty = html.html = html.text =
+                       head.appendTo = head.appendToRoot = head.before = head.after = head.clone = head.remove = head.destroy = head.prevNode = head.nextNode =
+                       head.empty = head.html = head.text =
+                       body.appendTo = body.appendToRoot = body.before = body.after = body.clone = body.remove = body.destroy = body.prevNode = body.nextNode = new Function( 'return this' );
+
+                       X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT, function(){
+                               X_ViewPort_readyState = X_TEMP.SYSTEM_EVENT_XTREE;
+                               if( X_TEMP.X_Dom_useBuilder ) X_TEMP.X_Dom_useBuilder = !!document.body.children.length;
+                               !X_TEMP.X_Dom_useBuilder && X_ViewPort.asyncDispatch( X_TEMP.SYSTEM_EVENT_XTREE );
+                       } );
+                       
+                       X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_XTREE, function(){
+                               X_ViewPort_readyState = X_TEMP.SYSTEM_EVENT_INIT;
+                               //X.UA.Opera7 && alert( 'bc' );
+                               Node._body.appendAt( 0,
+                                       Node._systemNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ),
+                                       Node._fontSizeNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ).cssText( 'line-height:1;height:1em;' ).text( 'X' )
+                               )._startUpdate();
+
+                               X_ViewPort.asyncDispatch( X_TEMP.SYSTEM_EVENT_INIT );
+                       } );
+
+                       X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_INIT, function(){
+                               var size = X_ViewPort_getWindowSize();
+                               
+                               if( X_Dom_orientationchange ){
+                                       X.ViewPort.listen( 'orientationchange', X_Dom_orientationchange );
+                               };
+                               
+                               if( X_Dom_detectFontSize ){
+                                       X.ViewPort.listen( 'resize', X_ViewPort_resize );
+                                       X.Timer.add( 333, X_Dom_detectFontSize );
+                               } else {
+                                       X.Timer.add( 333, X_ViewPort_resize );
+                               };
+                               
+                               X_ViewPort_baseFontSize = Node._fontSizeNode._rawObject.offsetHeight;
+                               
+                               X_ViewPort_readyState = X.Event.XDOM_READY;
+                               X_ViewPort.asyncDispatch( { type : X.Event.XDOM_READY, w : X_ViewPort_width = size[ 0 ], h : X_ViewPort_height = size[ 1 ] } );
+                       } );
+
+                       console.log( X_ViewPort.asyncDispatch( X_TEMP.SYSTEM_EVENT_PRE_INIT ) );        
+
+                       X.ViewPort
+                               .listen( 'beforeunload', X_ViewPort )
+                               .listenOnce( 'unload', X_ViewPort );
+
+//ブラウザの戻るボタンで戻ったときに呼ばれるイベントとかキャッシュとかそこらへんのこと
+//http://d.hatena.ne.jp/koumiya/20080916/1221580149
+
+                       if( document[ 'hidden' ] !== undefined ) {// iOS 7+
+                               Node._document.listen( 'visibilitychange', X_ViewPort );
+                       } else
+                       if( document[ 'webkitHidden' ] !== undefined ) {
+                               Node._document.listen( 'webkitvisibilitychange', X_ViewPort );
+                       } else
+                       if( X.UA.iOS && window[ 'onpageshow' ] !== undefined ) {
+                               X.ViewPort.listen( 'pageshow', X_ViewPort )
+                                                       .listen( 'pagehide', X_ViewPort );      
+                       } else {
+                               X.ViewPort.listen( 'focus', X_ViewPort )
+                                                       .listen( 'blur', X_ViewPort );
+                       };
+
+                       return X_Callback_UN_LISTEN;
+               };
+
+               function X_ViewPort_getWindowSize(){
+                       return X.UA.IE ?
+                               [ X_ViewPort_rootElement.clientWidth, X_ViewPort_rootElement.clientHeight ] :
+                               [ window.innerWidth, window.innerHeight ];
+               };
+
+
+console.log( 'X.Dom dom:w3c=' + X_UA_DOM.W3C + ' ev:w3c=' + X_UA_EVENT.W3C );
index 2540040..2e310c2 100644 (file)
@@ -14,7 +14,7 @@ X.Logger = {
        },\r
        _output : function( msg, level ){\r
                var body, $Area;\r
-               if( X.Dom && X.Dom.ready === true ){\r
+               if( X.Event.XDOM_READY <= X_ViewPort_readyState ){\r
                        if( $Area = X.Logger._$LogArea ){\r
                                $Area.remove();\r
                                delete X.Logger._$LogArea;\r
@@ -22,7 +22,7 @@ X.Logger = {
                        \r
                        \r
                } else\r
-               if( X.Dom && X.Dom.ready === true ){\r
+               if( X.Event.XDOM_READY <= X_ViewPort_readyState ){\r
                        if( !( $Area = X.Logger._$LogArea ) ){\r
                                $Area = X.Logger._$LogArea = X.Dom.Node( 'div' ).addToRoot( 0 );\r
                        };\r
index e7d98b2..e38e04f 100644 (file)
@@ -1,4 +1,5 @@
-\r
+X.Dom = {};\r
+\r
 var X_Dom_DTD_EMPTY = {\r
                AREA     : true,\r
                BASE     : true,\r
index eb8be17..1256f61 100644 (file)
@@ -207,7 +207,7 @@ function X_Node_getXNode( v ){
                        };\r
                        return v.UID && Node._chashe[ v.UID ];\r
                case X_Node_TYPE.WINDOW :\r
-                       return Node._window;\r
+                       return X.ViewPort;\r
                case X_Node_TYPE.DOCUMENT :\r
                        return Node._document;\r
                case X_Node_TYPE.RAW_TEXT :\r
@@ -254,7 +254,7 @@ Node.isXmlDocument =
 \r
 Node._chashe     = [];\r
 Node.none        = Node._chashe[ 0 ] = new Node();\r
-Node._window     = new X.EventDispatcher( window );\r
+\r
 Node._document   = new X.EventDispatcher( document );\r
 Node._html       = null; // = Node._chashe[ 1 ] <html>\r
 Node._head       = null; // = Node._chashe[ 2 ] <head>\r
@@ -909,7 +909,7 @@ Node.prototype._reserveUpdate = function(){
 \r
 Node.prototype._startUpdate = function(){\r
        var removal, i, xnode, tmp;\r
-       if( X_Dom_readyState < X_TEMP.SYSTEM_EVENT_INIT ){\r
+       if( X_ViewPort_readyState < X_TEMP.SYSTEM_EVENT_INIT ){\r
                return;\r
        };\r
        if( this._updateTimerID ){\r
@@ -919,7 +919,7 @@ Node.prototype._startUpdate = function(){
                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
+       // X_ViewPort._listeners && X_ViewPort._listeners[ X.Event.BEFORE_UPDATE ] && X_ViewPort.dispatch( X.Dom.Event.BEFORE_UPDATE );\r
 \r
        removal = Node._reserveRemoval;\r
        \r
@@ -943,7 +943,7 @@ Node.prototype._startUpdate = function(){
        \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
+       X_ViewPort._listeners && X_ViewPort._listeners[ X.Event.AFTER_UPDATE ] && X_ViewPort.asyncDispatch( X.Event.AFTER_UPDATE );\r
        //this._rawObject.style.visibility = tmp;\r
 };\r
 \r
index b79e4cd..d6ab359 100644 (file)
@@ -281,9 +281,9 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
                        //this.screenX       = e.screenX;\r
                        //this.screenY       = e.screenY;\r
                        \r
-                       //if( X_Dom_rootElement ){ // uuu...\r
-                               this.pageX         = e.clientX + X_Dom_rootElement.scrollLeft;\r
-                               this.pageY         = e.clientY + X_Dom_rootElement.scrollTop;\r
+                       //if( X_ViewPort_rootElement ){ // uuu...\r
+                               this.pageX         = e.clientX + X_ViewPort_rootElement.scrollLeft;\r
+                               this.pageY         = e.clientY + X_ViewPort_rootElement.scrollTop;\r
                                // DOMAssistant 2.8.1\r
                                //event.pageX = DOMAssistant.def(e.pageX)? e.pageX : (event.clientX + (de.scrollLeft || b.scrollLeft) - (de.clientLeft || 0));\r
                                //event.pageY = DOMAssistant.def(e.pageY)? e.pageY : (event.clientY + (de.scrollTop || b.scrollTop) - (de.clientTop || 0));                                                     \r
@@ -313,20 +313,6 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
        };\r
 };\r
 \r
-X.Dom.Event.VIEW_ACTIVATE       = ++X_Event_last;\r
-X.Dom.Event.VIEW_DEACTIVATE     = ++X_Event_last;\r
-X.Dom.Event.VIEW_RESIZED        = ++X_Event_last;\r
-X.Dom.Event.VIEW_TURNED         = ++X_Event_last;\r
-X.Dom.Event.BASE_FONT_RESIZED   = ++X_Event_last;\r
-// same_page_jump\r
-// on_screen_keyboard_show\r
-// on_screen_keyboard_hide\r
-// X.Dom.Event.BEFORE_UPDATE       = ++X_Event_last; // このイベントで要素のサイズを取得すると無限ループに!\r
-X.Dom.Event.AFTER_UPDATE        = ++X_Event_last;\r
-// hash_change\r
-X.Dom.Event.BEFORE_UNLOAD       = ++X_Event_last;\r
-X.Dom.Event.UNLOAD              = ++X_Event_last;\r
-\r
 X.Dom.Event.ANIME_BEFORE_START  = ++X_Event_last;\r
 X.Dom.Event.ANIME_START         = ++X_Event_last;\r
 X.Dom.Event.ANIME               = ++X_Event_last;\r
@@ -478,5 +464,5 @@ if( X.UA.WebKit || X.UA.Safari < 3 ){ // sniff
 };\r
 \r
 /* for other browsers */\r
-Node._window.listenOnce( 'load', X_TEMP.onDomContentLoaded );\r
+X.ViewPort.listenOnce( 'load', X_TEMP.onDomContentLoaded );\r
 \r
index 31d2058..d6b1cb9 100644 (file)
@@ -15,7 +15,7 @@ X.Dom.BoxModel = {
 \r
 \r
 \r
-X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_INIT, function(){\r
+X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_INIT, function(){\r
 \r
        var node = Node._systemNode,\r
        \r
index 1858bd9..5fbe5f2 100644 (file)
@@ -1072,14 +1072,14 @@ X.Dom.Node.prototype.cssText = function( v ){
 /*
  * ここでは HTMLElement のチ1ェックは行わない!
  * TODO
- * body に css attr がセットされた場合には X_Dom_baseFontSize をクリア
+ * body に css attr がセットされた場合には X_ViewPort_baseFontSize をクリア
  */
 
 X.Dom.Node.prototype._getCharSize =
        window.getComputedStyle ?
                (function(){
                        Node._body._updateTimerID && Node._body._startUpdate();
-                       if( this === Node._body && X_Dom_baseFontSize ) return X_Dom_baseFontSize;
+                       if( this === Node._body && X_ViewPort_baseFontSize ) return X_ViewPort_baseFontSize;
                        if( this._fontSize ) return this._fontSize;
                        return this._fontSize = parseFloat( getComputedStyle( this._rawObject, null ).fontSize );
                }) :
@@ -1087,7 +1087,7 @@ X.Dom.Node.prototype._getCharSize =
        document.defaultView && document.defaultView.getComputedStyle ?
                (function(){
                        Node._body._updateTimerID && Node._body._startUpdate();
-                       if( this === Node._body && X_Dom_baseFontSize ) return X_Dom_baseFontSize;
+                       if( this === Node._body && X_ViewPort_baseFontSize ) return X_ViewPort_baseFontSize;
                        if( this._fontSize ) return this._fontSize;
                        return this._fontSize = parseFloat( document.defaultView.getComputedStyle( this._rawObject, null ).fontSize );
                }) :
@@ -1104,7 +1104,7 @@ X.Dom.Node.prototype._getCharSize =
                (function(){
                        var font, vu, v, u, _v;
                        Node._body._updateTimerID && Node._body._startUpdate();
-                       if( this === Node._body && X_Dom_baseFontSize ) return X_Dom_baseFontSize;
+                       if( this === Node._body && X_ViewPort_baseFontSize ) return X_ViewPort_baseFontSize;
                        if( this._fontSize ) return this._fontSize;
                        
                        font = this._rawObject.currentStyle.fontSize;
@@ -1135,7 +1135,7 @@ X.Dom.Node.prototype._getCharSize =
                (function(){
                        var elm, v;
                        Node._body._updateTimerID && Node._body._startUpdate();
-                       if( this === Node._body && X_Dom_baseFontSize ) return X_Dom_baseFontSize;
+                       if( this === Node._body && X_ViewPort_baseFontSize ) return X_ViewPort_baseFontSize;
                        if( this._fontSize ) return this._fontSize;
 
                        this._rawObject.appendChild( elm = document.createElement( 'span' ) );
@@ -1149,7 +1149,7 @@ X.Dom.Node.prototype._getCharSize =
                (function(){
                        var font, vu, v, u, _v;
                        Node._body._updateTimerID && Node._body._startUpdate();
-                       if( this === Node._body && X_Dom_baseFontSize ) return X_Dom_baseFontSize;
+                       if( this === Node._body && X_ViewPort_baseFontSize ) return X_ViewPort_baseFontSize;
                        if( this._fontSize ) return this._fontSize;
                        
                        if( this._css && ( font = this._css.fontSize ) ){
@@ -1182,7 +1182,7 @@ X.Dom.Node.prototype._getCharSize =
                }) :
                (function(){
                        var elm, v;
-                       if( this === Node._body && X_Dom_baseFontSize ) return X_Dom_baseFontSize;
+                       if( this === Node._body && X_ViewPort_baseFontSize ) return X_ViewPort_baseFontSize;
                        Node._body._updateTimerID && Node._body._startUpdate();
                        if( this._fontSize ) return this._fontSize;
                        
@@ -1260,7 +1260,7 @@ X.Dom.Node.prototype._getCharSize =
                };
 } )();
 
-X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_INIT, function(){
+X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_INIT, function(){
        var xnode  = Node._systemNode,
                output = X.Dom.Style._UNIT_RATIO = {},
                list   = 'cm,mm,in,pt,pc'.split( ',' ),
index 1f8e25e..891bc79 100644 (file)
@@ -52,7 +52,7 @@ X.Dom.NodeList.prototype.each = function( func /* opt_args... */ ){
 /* --------------------------------------\r
  *  Fuction Base, multi, getter, setter,\r
  */\r
-X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT, function(){\r
+X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT, function(){\r
        var target = X.Dom.NodeList.prototype,\r
                src    = X.Dom.Node.prototype,\r
                p, v, multi;\r
index 371d81d..2e065e8 100644 (file)
@@ -242,8 +242,8 @@ X.Dom.Query._parse = function( query, last ){
             links, className, attr, flag;\r
 \r
                /*@+debug[*/\r
-               if( X_Dom_readyState < X.Event.XDOM_READY ){\r
-                       alert( 'not ready! use X.Dom.listenOnce( X.Event.XDOM_READY, callback )' );\r
+               if( X_ViewPort_readyState < X.Event.XDOM_READY ){\r
+                       alert( 'not ready! use X.ViewPort.listenOnce( X.Event.XDOM_READY, callback )' );\r
                        return;\r
                };\r
                /*]@+debug*/\r
index fe25591..86dd109 100644 (file)
@@ -20,10 +20,10 @@ if( X.UA.MacIE ){
                } else\r
                if( node.nodeType === 3 ){\r
                        //node.data = '';\r
-                       l = X.Dom._removalTextNodes.length;\r
+                       l = X_TEMP._removalTextNodes.length;\r
                        if( parent ){\r
-                               //!l && X.Timer.once( 0, X.Dom._timer_remove );\r
-                               //X.Dom._removalTextNodes[ l ] = node;\r
+                               //!l && X.Timer.once( 0, X_TEMP._timerRemove );\r
+                               //X_TEMP._removalTextNodes[ l ] = node;\r
                                //var str=[],p;\r
                                //for( p in node ){\r
                                //      str[str.length] = p;\r
@@ -69,10 +69,10 @@ if( X.UA.MacIE ){
                };\r
        };\r
        \r
-       X.Dom._removalTextNodes = [];\r
+       X_TEMP._removalTextNodes = [];\r
        \r
-       X.Dom._timer_remove = function(){\r
-               var nodes = X.Dom._removalTextNodes,\r
+       X_TEMP._timerRemove = function(){\r
+               var nodes = X_TEMP._removalTextNodes,\r
                        i = 0, node;\r
                while( i < 5 && nodes.length ){\r
                        node = nodes.shift();\r
@@ -82,7 +82,7 @@ if( X.UA.MacIE ){
                        };\r
                };\r
                \r
-               //nodes.length && X.Timer.once( 1000, X.Dom._timer_remove );\r
+               //nodes.length && X.Timer.once( 1000, X_TEMP._timerRemove );\r
        };\r
        \r
 } else\r
@@ -105,7 +105,7 @@ if( X.UA.Opera7 ){
  * http://kojs.sukobuto.com/docs/visible-binding\r
  * IE6 には、「空の span エレメントに続く空白は無視される」という謎な癖があります。 \r
  */\r
-X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT,\r
+X.ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT,\r
        X_UA_DOM.W3C ?\r
 (function(){\r
        var r    = Node._body,\r
@@ -305,7 +305,7 @@ X_TEMP.asyncCreateTree = function ( parent, elems, elmProgress, async ){
                current = null;\r
        };\r
        // complete\r
-       X.Dom.asyncDispatch( 0, X_TEMP.SYSTEM_EVENT_XTREE );\r
+       X_ViewPort.asyncDispatch( X_TEMP.SYSTEM_EVENT_XTREE );\r
        elmProgress.parentNode ? elmProgress.parentNode.removeChild( elmProgress ) : ( elmProgress.outerHTML = '' );\r
        delete X_TEMP.asyncCreateTree;\r
        delete X_TEMP.bindElementToXnode;\r
index c0d9871..7ea88a6 100644 (file)
@@ -33,7 +33,7 @@ X.Util.NinjaIframe = X.EventDispatcher.inherits(
                                }\r
                        );\r
                        \r
-                       X.Dom.listenOnce( X.Dom.Event.AFTER_UPDATE, this );\r
+                       X.ViewPort.listenOnce( X.Event.AFTER_UPDATE, this );\r
                        \r
                        // http://nanto.asablo.jp/blog/2011/12/08/6237308\r
                        // IE 6/7 で文書間通信を実現するための一案\r
@@ -53,7 +53,7 @@ X.Util.NinjaIframe = X.EventDispatcher.inherits(
                                html, idoc;\r
                        \r
                        switch( e.type ){\r
-                               case X.Dom.Event.AFTER_UPDATE :\r
+                               case X.Event.AFTER_UPDATE :\r
                                        this._iwin = raw.contentWindow || raw.contentDocument && raw.contentDocument.parentWindow || window.frames[ this._name ];\r
                                        \r
                                        this.xnodeIframe.listen( X.UA.IE < 9 ? [ 'readystatechange', 'error' ] : [ 'load', 'error' ], this );\r
@@ -111,7 +111,7 @@ X.Util.NinjaIframe = X.EventDispatcher.inherits(
                },\r
                \r
                close : function(){\r
-                       X.Dom.unlisten( X.Dom.Event.AFTER_UPDATE, this );\r
+                       X_ViewPort.unlisten( X.Event.AFTER_UPDATE, this );\r
                        this.xnodeIframe.call( 'close' );\r
                        this.xnodeIframe.destroy();\r
                }\r
index b13f170..a692fbc 100644 (file)
@@ -1,6 +1,6 @@
 
 X.UI._eventRellay = function( e ){
-       var font    = X.Dom.getBaseFontSize(),
+       var font    = X.ViewPort.getBaseFontSize(),
                x       = e.clientX / font,
                y       = e.clientY / font,
                type    = X.UI.Event.NameToID[ e.type ],
@@ -85,10 +85,10 @@ X.UI._PageRoot = X.UI._Box.inherits(
                Constructor : function( layout, args ){
                        this.SuperConstructor( layout, args );
                        
-                       if( X_Dom_readyState === X.Event.XDOM_READY ){
+                       if( X_ViewPort_readyState === X.Event.XDOM_READY ){
                                X.Timer.once( 0, this, this.start );
                        } else {
-                               X.Dom.listenOnce( X.Event.XDOM_READY, this, this.start );
+                               X.ViewPort.listenOnce( X.Event.XDOM_READY, this, this.start );
                        };
                        
                        this.hoverList    = [];
@@ -114,7 +114,6 @@ X.UI._PageRoot = X.UI._Box.inherits(
                        } );
                        
                        // hover や rollover rollout のための move イベントの追加
-                       // X.Dom.Event.activate, X.Dom.Event.deactivate ?
                        // mouseout, mouseover
                        //if( X_UA_HID.POINTER ){
                                this.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE ], X.UI._eventRellay );
@@ -143,9 +142,9 @@ X.UI._PageRoot = X.UI._Box.inherits(
                doFirstCalc : function(){
                        this.calculate();
                        this.phase = 4;
-                       X.Dom
-                               .listen( X.Dom.Event.VIEW_RESIZED, this, this.calculate )
-                               .listen( X.Dom.Event.BASE_FONT_RESIZED, this, this.calculate );
+                       X.ViewPort
+                               .listen( X.Event.VIEW_RESIZED, this, this.calculate )
+                               .listen( X.Event.BASE_FONT_RESIZED, this, this.calculate );
                },
                
                reserveCalc : function(){
@@ -157,8 +156,8 @@ X.UI._PageRoot = X.UI._Box.inherits(
                calculate : function( e ){
                        var font, size, w, h;
                        if( !e ){
-                               size = X.Dom.getSize();
-                               font = X.Dom.getBaseFontSize();
+                               size = X.ViewPort.getSize();
+                               font = X.ViewPort.getBaseFontSize();
                                w    = size[ 0 ];
                                h    = size[ 1 ];
                        } else {