X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F02_XUA.js;h=78b62f27a1f026d7365c3dbaab9c49ae4c5f308f;hb=35daae003b3b017a92d0c883f120bf3baf604fba;hp=6f6e58ba037447b9a016f85d3d0352d8220161b9;hpb=427c4cbb7f8b1ee674b845ade0796fcbfee0fcba;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 6f6e58b..78b62f2 100644
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -323,9 +323,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 +359,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;