X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F21_XViewPort.js;h=ae083d777313d9723ea257747f6399e5327fab63;hb=a205577d1e16a34301f1199dcf9c699aa2c37fb9;hp=a89df058517dd4b2dce198e5c874d90acd81eebe;hpb=527f50d3e1930a335a6525b5c973ab27fe385868;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/01_core/21_XViewPort.js b/0.6.x/js/01_core/21_XViewPort.js
index a89df05..ae083d7 100644
--- a/0.6.x/js/01_core/21_XViewPort.js
+++ b/0.6.x/js/01_core/21_XViewPort.js
@@ -41,7 +41,7 @@ X_ViewPort = X_Class_override(
 				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;
+					if( X_Type_isString( href ) && !href.toLowerCase().indexOf( 'javascript:' ) ) return X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_STOP_PROPAGATION;
 					
 					return X_ViewPort[ 'dispatch' ]( X_EVENT_BEFORE_UNLOAD );
 					
@@ -75,7 +75,8 @@ X_ViewPort = X_Class_override(
 	
 				case 'blur' :
 				case 'focusout' :
-					if( 5 < X_UA[ 'IE' ] && X_UA[ 'IE' ] < 9 ){
+					// TODO ie5...
+					if( 5.5 < X_UA[ 'IE' ] && X_UA[ 'IE' ] < 9 ){
 						xnode = X_Node_getXNode( document.activeElement );
 						if( xnode ){
 							xnode[ 'listenOnce' ]( [ 'focus', 'blur' ], X_ViewPort_detectFocusForIE );
@@ -136,6 +137,7 @@ function X_ViewPort_changeFocus(){
 };
 
 
+// TODO EventDispatcherProxy
 /**
  * window に相当する ViewPort 情報を提供するオブジェクト。
  * @namespace X.ViewPort
@@ -431,7 +433,7 @@ X[ 'ViewPort' ] = {
 			X_ViewPort_rootElement = document.compatMode !== 'CSS1Compat' ? X_elmBody : X_elmHtml || X_elmBody;
 
 	/**
-	 * Node( documentElement )
+	 * X.Node( documentElement )
 	 * @alias X.Doc.html
 	 * @type {Node}
 	 */
@@ -439,14 +441,14 @@ X[ 'ViewPort' ] = {
 			html[ '_flags' ] |= X_NodeFlags_IN_TREE;
 
 	/**
-	 * Node( head )
+	 * X.Node( head )
 	 * @alias X.Doc.head
 	 * @type {Node}
 	 */			
 			X[ 'Doc' ][ 'head' ] = head = X_Node_head = X_elmHead && Node( X_elmHead );
 
 	/**
-	 * Node( documentElement )
+	 * X.Node( body )
 	 * @alias X.Doc.body
 	 * @type {Node}
 	 */		
@@ -464,7 +466,6 @@ X[ 'ViewPort' ] = {
 
 			X_ViewPort[ 'listenOnce' ]( X_EVENT_PRE_INIT, function(){
 				X_ViewPort_readyState = X_EVENT_XTREE_READY;
-				if( X_TEMP.X_Dom_useBuilder ) X_TEMP.X_Dom_useBuilder = !!X_elmBody.children.length;
 				!X_TEMP.X_Dom_useBuilder && X_ViewPort[ 'asyncDispatch' ]( X_EVENT_XTREE_READY );
 			} );
 			
@@ -511,11 +512,11 @@ X[ 'ViewPort' ] = {
 				
 				//
 				if( X_ViewPort_orientationchange ){
-					X_EventDispatcher_systemListen( X_ViewPort, 'orientationchange', X_ViewPort_orientationchange );
+					X_ViewPort[ 'listen' ]( 'orientationchange', X_ViewPort_orientationchange );
 				};
 				
 				if( X_ViewPort_detectFontSize ){
-					X_EventDispatcher_systemListen( X_ViewPort, 'resize', X_ViewPort_resize );
+					X_ViewPort[ 'listen' ]( 'resize', X_ViewPort_resize );
 					X_Timer_add( 333, X_ViewPort_detectFontSize );
 				} else {
 					X_Timer_add( 333, X_ViewPort_resize );
@@ -526,39 +527,37 @@ X[ 'ViewPort' ] = {
 				X_ViewPort[ 'asyncDispatch' ]( X_ViewPort_readyState = X_EVENT_XDOM_READY );
 			} );
 
-			X_ViewPort[ 'asyncDispatch' ]( X_EVENT_PRE_INIT );	
+			if( X_TEMP.X_Dom_useBuilder ) X_TEMP.X_Dom_useBuilder = !!X_elmBody.children.length;
+			X_ViewPort[ 'asyncDispatch' ]( X_EVENT_PRE_INIT );
 
+			X_ViewPort[ 'listen' ]( [ 'beforeunload', 'unload' ] );
 
-			X_EventDispatcher_systemListen( X_ViewPort, [ 'beforeunload', 'unload' ] );
-
-//ブラウザの戻るボタンで戻ったときに呼ばれるイベントとかキャッシュとかそこらへんのこと
-//http://d.hatena.ne.jp/koumiya/20080916/1221580149
-
-console.log( '------------------->' );
+		//ブラウザの戻るボタンで戻ったときに呼ばれるイベントとかキャッシュとかそこらへんのこと
+		//http://d.hatena.ne.jp/koumiya/20080916/1221580149
 
 			if( document[ 'webkitHidden' ] !== undefined ){
-				X_EventDispatcher_systemListen( X_ViewPort_document, 'webkitvisibilitychange', X_ViewPort );
+				X_ViewPort_document[ 'listen' ]( 'webkitvisibilitychange', X_ViewPort );
 			} else
 			if( document[ 'hidden' ] !== undefined ){// iOS 7+
-				X_EventDispatcher_systemListen( X_ViewPort_document, 'visibilitychange', X_ViewPort );
+				X_ViewPort_document[ 'listen' ]( 'visibilitychange', X_ViewPort );
 			} else
 			if( document[ 'msHidden' ] !== undefined ){
-				X_EventDispatcher_systemListen( X_ViewPort_document, 'msvisibilitychange', X_ViewPort );
+				X_ViewPort_document[ 'listen' ]( 'msvisibilitychange', X_ViewPort );
 			} else
 			if( document[ 'mozHidden' ] !== undefined ){
-				X_EventDispatcher_systemListen( X_ViewPort_document, 'mozvisibilitychange', X_ViewPort );
+				X_ViewPort_document[ 'listen' ]( 'mozvisibilitychange', X_ViewPort );
 			};
 			
 			if( window[ 'onpageshow' ] !== undefined ){
-				X_EventDispatcher_systemListen( X_ViewPort, [ 'pageshow', 'pagehide' ] );
+				X_ViewPort[ 'listen' ]( [ 'pageshow', 'pagehide' ] );
 			};
 			
 			if( document[ 'onfocusin' ] !== undefined ){
 				// https://github.com/ai/visibilityjs/blob/master/lib/visibility.fallback.js
-				X_EventDispatcher_systemListen( X_ViewPort_document, [ 'focusin', 'focusout' ], X_ViewPort );
+				X_ViewPort_document[ 'listen' ]( [ 'focusin', 'focusout' ], X_ViewPort );
 			};
 			
-			X_EventDispatcher_systemListen( X_ViewPort, [ 'focus', 'blur' ] );
+			X_ViewPort[ 'listen' ]( [ 'focus', 'blur' ] );
 
 			return X_CALLBACK_UN_LISTEN;
 		};
@@ -587,7 +586,7 @@ console.log( 'X.Dom dom:w3c=' + X_UA_DOM.W3C + ' ev:w3c=' + X_UA_EVENT.W3C );
 if( X_UA_EVENT.W3C ){
 	X_ViewPort_document[ 'listenOnce' ]( 'DOMContentLoaded', X_TEMP.onDomContentLoaded );
 } else
-if( 6 <= X_UA[ 'IE' ] && X[ 'inHead' ] && !X_UA[ 'ieExeComError' ] ){ // standalone の除外 ->  && !X_UA[ 'ieExeComError' ]
+if( 6 <= X_UA[ 'IE' ] && X[ 'inHead' ] /* && !X_UA[ 'ieExeComError' ] */ ){ // standalone の除外 ->  && !X_UA[ 'ieExeComError' ]
 	// if this script in Head
 	//document.write( '<script id=__ieonload defer src=javascript:void(0)></script>' );
 	//X_TEMP._script = document.getElementById( '__ieonload' );