Version 0.6.96. add lock function @X.EventDispatcher.

[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 00_XDom.js

diff --git a/0.6.x/js/02_dom/00_XDom.js b/0.6.x/js/02_dom/00_XDom.js
index 4590e52..39c5483 100644 (file)
--- a/0.6.x/js/02_dom/00_XDom.js
+++ b/0.6.x/js/02_dom/00_XDom.js
@@ -53,7 +53,7 @@ X.Dom = X.Class._override(
                                /*\r
                                 * X.Event.XDOM_READY 以後に listen した場合の対策\r
                                 */\r
-                               X.Dom.asyncDispatch( 0, { type : type, w : X_Dom_width, h : X_Dom_height } );\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
@@ -117,7 +117,7 @@ X.Dom = X.Class._override(
                getBaseFontSize : function(){\r
                        if( Node._body._updateTimerID ){\r
                                Node._body._startUpdate();\r
-                               return Node._fontSizeNode._rawObject.offsetHeight;\r
+                               return X_Dom_baseFontSize = Node._fontSizeNode._rawObject.offsetHeight;\r
                        };\r
                        return X_Dom_baseFontSize;\r
                }\r
@@ -171,7 +171,7 @@ X.Dom = X.Class._override(
                                        \r
                                        size = Node._fontSizeNode._rawObject.offsetHeight;\r
                                        if( X_Dom_baseFontSize !== size ){\r
-                                               X_Dom_baseFontSize && X.Dom.asyncDispatch( 0, { type : X.Dom.Event.BASE_FONT_RESIZED, fontSize : size, w : X_Dom_width, h : X_Dom_height  } );\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
@@ -186,13 +186,13 @@ X.Dom = X.Class._override(
                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_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( 0, { type : X.Dom.Event.VIEW_RESIZED, fontSize : size, w : X_Dom_width, h : X_Dom_height } );\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
@@ -208,7 +208,7 @@ X.Dom = X.Class._override(
                        X_Dom_readyState = X_TEMP.SYSTEM_EVENT_PRE_INIT;\r
                        \r
                        // DOMContentLoaded の無いブラウザで X_TEMP.onDomContentLoaded への参照が残り続けるのを回避\r
-                       Node._document.unlisten( '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
@@ -243,7 +243,8 @@ X.Dom = X.Class._override(
 \r
                        X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT, function(){\r
                                X_Dom_readyState = X_TEMP.SYSTEM_EVENT_XTREE;\r
-                               !X_TEMP.X_Dom_useBuilder && X.Dom.asyncDispatch( 0, 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
@@ -254,7 +255,7 @@ X.Dom = X.Class._override(
                                        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, X_TEMP.SYSTEM_EVENT_INIT );\r
+                               X.Dom.asyncDispatch( X_TEMP.SYSTEM_EVENT_INIT );\r
                        } );\r
 \r
                        X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_INIT, function(){\r
@@ -274,10 +275,10 @@ X.Dom = X.Class._override(
                                X_Dom_baseFontSize = Node._fontSizeNode._rawObject.offsetHeight;\r
                                \r
                                X_Dom_readyState = X.Event.XDOM_READY;\r
-                               X.Dom.asyncDispatch( 0, { type : X.Event.XDOM_READY, w : X_Dom_width = size[ 0 ], h : X_Dom_height = size[ 1 ] } );\r
+                               X.Dom.asyncDispatch( { type : X.Event.XDOM_READY, w : X_Dom_width = size[ 0 ], h : X_Dom_height = size[ 1 ] } );\r
                        } );\r
 \r
-                       X.Dom.asyncDispatch( 0, X_TEMP.SYSTEM_EVENT_PRE_INIT ); \r
+                       console.log( X.Dom.asyncDispatch( X_TEMP.SYSTEM_EVENT_PRE_INIT ) );     \r
 \r
                        Node._window\r
                                .listen( 'beforeunload', X.Dom )\r
@@ -314,7 +315,7 @@ if( !( X.UA.IE < 9 || X.UA.iOS ) ){
        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( 0, { type : X.Dom.Event.BASE_FONT_RESIZED, fontSize : size, w : X_Dom_width, h : X_Dom_height } );\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