X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F02_XUA.js;h=896be7eeb1d216f6e3ffc4e8d3981c24b6602cd5;hb=dd4fcb6269ff74be253a767826aa5dfb96dd4acc;hp=4a6228c74b6b195445dcf1ca7ac9a471acbd9e20;hpb=a4c3d3a22b13112b3317a6ffd3eff2272c2264f1;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/01_core/02_XUA.js b/0.6.x/js/01_core/02_XUA.js
index 4a6228c..896be7e 100644
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -53,9 +53,8 @@ var X_UA = X[ 'UA' ] = {},
 		 */
 		X_UA[ 'iOS' ]  = X_UA[ 'iOSMajor' ] + X_UA[ 'iOSMinor' ]  / 10;
 
-		if( screen.width === screen.height * 1.5 || screen.width * 1.5 === screen.height ){
-			v = true; // 4:3 model
-		};
+		// 4:3 model
+		v = screen.width === screen.height * 1.5 || screen.width * 1.5 === screen.height;
 		
 		if( sys === 'iPhone' ){
 			/**
@@ -155,14 +154,14 @@ var X_UA = X[ 'UA' ] = {},
 				 * @type {boolean}
 				 */
 				X_UA[ sys ] = true;
-				
-				if( v = dav.split( 'Windows NT 10' )[ 1 ] ){
+
+				if( v = dua.split( 'Windows NT 10' )[ 1 ] ){
 					switch( v.substr( 0, 2 ) ){
 						case '.0' : v = 10; break;
 						default : v = '?';
 					};
 				} else
-				if( v = dav.split( 'Windows NT ' )[ 1 ] ){
+				if( v = dua.split( 'Windows NT ' )[ 1 ] ){
 					switch( v.substr( 0, 3 ) ){
 						case '6.3' : v = 8.1; break;
 						case '6.2' : v = 8; break;
@@ -173,9 +172,9 @@ var X_UA = X[ 'UA' ] = {},
 						case '5.0' : v = v.indexOf( '5.01' ) ? 2000 : '2kSP1'; break;
 						case '4.0' : v = 'NT'; break;
 						default : v = '?';
-					};			
+					};	
 				} else
-				if( v = dav.split( 'Windows ' )[ 1 ] ){
+				if( v = dua.split( 'Windows ' )[ 1 ] ){
 					switch( v.substr( 0, 2 ) ){
 						case '98' : v = v.indexOf( '98; Win 9x 4.90' ) ? '98|98SE' : 'ME'; break;
 						case '95' : v = 95; break;
@@ -279,12 +278,12 @@ var X_UA = X[ 'UA' ] = {},
 		 * @alias X.UA.Opera7
 		 * @type {boolean}
 		 */
-		X_UA[ 'Opera7' ]      = v < 8;
+		X_UA[ 'Opera7' ] = v < 8;
 		/**
 		 * @alias X.UA.Opera78
 		 * @type {boolean}
 		 */
-		X_UA[ 'Opera78' ]     = v < 9;
+		X_UA[ 'Opera78' ] = v < 9;
 		
 		if( 0 < dua.indexOf( 'Opera Mini' ) )
 			/**
@@ -323,9 +322,26 @@ var X_UA = X[ 'UA' ] = {},
 
 		console.log( '>> Opera : ' + v );
 	} else
-	
+	if( v = parseFloat( dav.split( 'Edge/' )[ 1 ] ) ){
+		/**
+		 * Microsoft Edge
+		 * @alias X.UA.Edge
+		 * @type {number}
+		 */
+			X_UA[ 'Edge' ]  = v;
+
+		if( dav.indexOf( 'Mobile' ) ){
+			/**
+			 * Microsoft Edge for Windows 10 Mobile
+			 * @alias X.UA.EdgeMobile
+			 * @type {number}
+			 */
+				X_UA[ 'EdgeMobile' ] = v;
+		};
+
+	}  else
 	// Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko
-	if( ( v = dav.split( 'Trident/' )[ 1 ] ) || document.all ){
+	if( ( v = dav.split( 'Trident/' )[ 1 ] ) || document.all ){ // .all は Opera にもいるので Opera の判定が先
 		if( v = parseFloat( v ) )
 		/**
 		 * IE11 の互換モードの navigator.appVersion にも Trident/7.0 が書かれているため互換モードか?判定ができるc 
@@ -342,8 +358,7 @@ var X_UA = X[ 'UA' ] = {},
 			X_UA[ 'ActiveX' ] = true;
 
 		v = parseFloat( dua.split( 'MSIE ' )[ 1 ] ) ||
-			parseFloat( dua.split( 'rv:' )[ 1 ] ) ||
-			parseFloat( dav.split( 'MSIE ' )[ 1 ] ) || 0;
+			parseFloat( dua.split( 'rv:' )[ 1 ] ) || 0;
 
 		tridentToVer = X_UA[ 'Trident' ] ? ( X_UA[ 'Trident' ] + 4 | 0 ) : v;
 
@@ -360,7 +375,7 @@ var X_UA = X[ 'UA' ] = {},
 		 * @alias X.UA.IE
 		 * @type {number}
 		 */
-		X_UA[ 'IE' ]   = v = document.documentMode || tridentToVer;
+		X_UA[ 'IE' ] = v = document.documentMode || tridentToVer;
 
 		if( v < 4.5 ){
 			/**
@@ -720,6 +735,7 @@ var X_UA = X[ 'UA' ] = {},
 
 (function(){
 	var k, v;
+
 	if( X_UA[ 'IE45' ] || X_UA[ 'IE4' ] ){
 		if( X_UA[ 'Mac' ] ){
 			X_UA_classNameForHTML = 'Mac';
@@ -728,20 +744,20 @@ var X_UA = X[ 'UA' ] = {},
 			// TODO CE3 の ie4 と WM の ie4 の分岐
 			X_UA_classNameForHTML = 'WinCE';
 		} else
-		if( X_UA[ 'Win' ] ){
+		if( X_UA[ 'Windows' ] ){
 			X_UA_classNameForHTML = 'Win';
 		} else {
 			X_UA_classNameForHTML = 'Other';
 		};		
 		
-		X_UA_classNameForHTML += 'IE4';
+		X_UA_classNameForHTML += '_IE4';
 		
 		if( X_UA[ 'IE45' ] ){
 			X_UA_classNameForHTML += '5';
 		};
 
 		if( X_UA[ 'ActiveX' ] ){
-			X_UA_classNameForHTML += 'ActiveX';
+			X_UA_classNameForHTML += '_ActiveX';
 		};
 		
 	} else {
@@ -822,101 +838,3 @@ X_UA_ATagWrapDiv = (function( e, h ){
 })();
 
 console.log( 'HTML5? ' + X_UA_ATagWrapDiv ); */
-
-var X_Script_VBS_ENABLED = X_UA[ 'Windows' ] && !X_UA[ 'WinCE' ] && !X_UA[ 'WinPhone' ] && X_UA[ 'IE' ] < 11,
-	// 構文のサポート instanceof, in(for-in ではない), try-catch. JS version 1.5以上
-	X_Script_gte15       = !( X_UA[ 'IE' ] < 5.5 ) && ( new Function( 'f,a', 'try{return f.apply({},a)}catch(e){}' ) );
-
-/**
- * js バージョン間の際を吸収
- * @namespace X.Script
- * @alias X.Script
- * @type {object}
- */
-X[ 'Script' ] = {
-	'tryCatch' : X_Script_try
-};
-
-if( X_Script_VBS_ENABLED ){
-	X_Script_gte15 || document.write( '<script type=text/vbscript>' +
-		[
-			'Function vbs_testAXO(v)',
-				'On Error Resume Next',
-				'Set ax = CreateObject(v)',
-				'If Err.Number Then',
-					'ax = 1',
-				'End If',
-				'Err.Clear',
-				'vbs_testAXO = ax',
-			'End Function' /*,
-			
-			'Function vbs_try(jsFunc,a1,a2,a3,a4)',
-				'On Error Resume Next',
-				'Set rs = jsFunc(a1,a2,a3,a4)',
-				'If Err.Number != 0 Then',
-					'rs = 0',
-				'End If',
-				'Err.Clear',
-				'vbs_try = rs',
-			'End Function'
-			
-			// elementID .SRC = v
-			'Function vbs_setValue(id,k,v)',
-				'On Error Resume Next',
-				'Set rs = 1',
-				'Document.all[id][k]=v',
-				'If Err.Number != 0 Then',
-					'rs = 0',
-				'End If',
-				'Err.Clear',
-				'vbs_try = rs',
-			'End Function'
-
-			* 
-			* 
-			* */
-		].join( '\n' ) + '</script>' );
-
-	// TODO Object のメンバを辿る vba
-	// byte Array を扱う vba
-};
-
-function X_Script_try( func, args ){
-	if( !X_Script_gte15 ){
-		//return func.apply( {}, args );
-		return;
-	};
-	return X_Script_gte15( func, args || [] );
-};
-
-function X_Script_createActiveXObjectSafty( name ){
-	if( !X_Script_gte15 ){
-		if( X_Script_VBS_ENABLED ){
-			// console.log( window[ 'vbs_testAXO' ]( name ) + ' ' + name );
-			return !window[ 'vbs_testAXO' ]( name ) && X_Script_createActiveXObject( name );
-		};
-		return X_Script_createActiveXObject( name );
-	};
-	
-	return X_Script_try( X_Script_createActiveXObject, [ name ] );
-};
-
-function X_Script_createActiveXObject( name ){
-	return new ActiveXObject( name );
-};
-
-/*
- * http://archiva.jp/web/html-css/ie6_background_flickr.html
- * hover時の背景画像ちらつきに対処する
- * この問題はIE6固有の問題であり、他のモダンブラウザやIE5等では発現しない。
- */
-if( X_UA[ 'IE6' ] && // error @ NN7.2
-	!X_Script_try( function(){ document.execCommand( 'BackgroundImageCache', false, true ); return 1; } ) ){
-		/**
-		 * ie6 のみで実行する document.execCommand( 'BackgroundImageCache', false, true ) の失敗。
-		 * bonus: hotfix for IE6 SP1 (bug KB823727)
-		 * multipleIEs IE6 standalone 版では不可, IE5.5 は可,,,
-		 * @alias X.UA.ieExeComError */
-		X_UA[ 'ieExeComError' ] = true;
-};
-