X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F02_XUA.js;h=8302b9762d0bdde55acf2e72c6ca6b40f1ad5f80;hb=ecfded871abcf085bbc2b862352232190b87fd27;hp=fafe84655cb3095aef5a38972d7e6f534dd0e48e;hpb=eca68ae8a52822bb0d2d7556fd28784bb2103a2f;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 fafe846..8302b97 100644
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -136,26 +136,65 @@ var X_UA = X[ 'UA' ] = {},
 		X_UA[ 'webOS' ]  = true; // webOS
 	} else
 	if( sys.indexOf( 'Win' ) + 1 ){
-		console.log( 'Win' );
-		/**
-		 * @alias X.UA.Windows
-		 * @type {boolean}
-		 */
-		X_UA[ 'Windows' ]  = true;
+
 		switch( sys ){
+			case 'WinCE' :
+				/**
+				 * @alias X.UA.WinCE
+				 * @type {boolean}
+				 */
+				X_UA[ sys ] = true;
+				break;
 			case 'Win16' :
 			case 'Win32' :
 			case 'Win64' :
-			case 'WinCE' :
 				/**
 				 * @alias X.UA.Win16
 				 * @alias X.UA.Win32
 				 * @alias X.UA.Win64
-				 * @alias X.UA.WinCE
 				 * @type {boolean}
 				 */
 				X_UA[ sys ] = true;
+				
+				if( v = dav.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 ] ){
+					switch( v.substr( 0, 3 ) ){
+						case '6.3' : v = 8.1; break;
+						case '6.2' : v = 8; break;
+						case '6.1' : v = 7; break;
+						case '6.0' : v = 'Vista'; break;
+						case '5.2' : v = '2003|XP64'; break;
+						case '5.1' : v = v.indexOf( '5.1; SV1' ) ? 'XP' : 'XPSP2'; break;
+						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 ] ){
+					switch( v.substr( 0, 2 ) ){
+						case '98' : v = v.indexOf( '98; Win 9x 4.90' ) ? '98|98SE' : 'ME'; break;
+						case '95' : v = 95; break;
+						case '3.' : v = parseFloat( v ); break;
+						default : v = '?';
+					};	
+				} else {
+					v = '?';
+				};
+				
+				/**
+				 * 10, 8.1, 8, 7, Vista, 2003|XP64, XPSP2, XP, 2kSP1, 2000, ME, 98|98SE, 95, ?
+				 * @alias X.UA.Windows
+				 * @type {number|string}
+				 */				
+				X_UA[ 'Windows' ] = v;
+				break;
 		};
+
 		// winRT
 	} else
 	if( sys.indexOf( 'Mac' ) + 1 ){